diff --git a/debian/changelog b/debian/changelog
index 3588fd3b..4f04ae06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
     - Allow the usage of a local mirror of the daily d-i builds to be used
       for sid_d-i builds, this is done by setting DI_WWW_HOME=default and
       DI_DIR=/path/to/the/mirror
+    - Add autorun capabilities to i386 cds so that instead of getting the
+      "what do you want Windows to do" question under XP, we get the html
+      README started.
 
 -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386
index a874bf67..5aa629ea 100755
--- a/tools/boot/sarge/boot-i386
+++ b/tools/boot/sarge/boot-i386
@@ -223,6 +223,20 @@ if [ "$NN" = "1" ]; then
 	fi
 fi
 
+# Add autorun if we have README.html
+
+if [ -f $CDDIR/README.html ]; then
+	todos > $CDDIR/autorun.inf <<EOF
+[autorun]
+open=autorun.bat
+EOF
+	todos > $CDDIR/autorun.bat <<EOF
+@echo Starting "README.html"...
+@start README.html
+@exit
+EOF
+fi
+
 # write final lines to mkisofs_opts
 if [ "$NN" = "1" ]; then
 	echo -n "boot$N " >> $N.mkisofs_opts