diff --git a/debian/changelog b/debian/changelog
index 35ddcfca..b6b0a3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,9 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Correct url to the amd64 dailys.
+  * Add gtk initrd to amd64 images if available.
+  * Add autorun file to amd64 images if there's a README.html, same as for
+    i386.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 15 Jun 2006 15:25:08 -0400
 
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index fb288e95..89e67efb 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -17,7 +17,8 @@ if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://amd64.debian.net/debian-installer/daily"
    if [ -n "$DI_DIR" ];then
       DI_DIR="$DI_DIR/${DI_WWW_HOME##*/}"
-      DI_WWW_HOME=""                     
+      DI_WWW_HOME=""
+      echo "Using images from $DI_DIR"
    fi
 fi
 if [ ! "$DI_DIST" ]; then
@@ -66,16 +67,49 @@ cp -lf cdrom/vmlinuz $CDDIR/install/
 cp -lf cdrom/initrd.gz $CDDIR/install/
 echo -n "-cache-inodes -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
 
+syslinux_files () {
+	type=$1
+
+	mv boot$N/isolinux/f3.txt.$type boot$N/isolinux/f3.txt
+	mv boot$N/isolinux/f4.txt.$type boot$N/isolinux/f4.txt
+	mv boot$N/isolinux/isolinux.cfg.$type boot$N/isolinux/isolinux.cfg
+}
+
+extra_image () {
+	image=$1
+	dir=$(dirname "$image")
+
+	if [ ! -e "$image" ]; then
+		mkdir -p $dir
+		if [ ! "$DI_WWW_HOME" ];then
+			if [ ! "$DI_DIR" ];then
+				DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+			fi
+			cp "$DI_DIR/cdrom/$image" "$image"
+		else
+			wget "$DI_WWW_HOME/cdrom/$image" -O "$image"
+		fi
+	fi
+
+	if [ ! -d $CDDIR/install/$dir ]; then
+		mkdir -p $CDDIR/install/$dir
+	fi
+	cp -a "$image" $CDDIR/install/$dir/
+}
+
 # Include Smart Boot Manager image for people where isolinux fails
 gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
 # Keep the original file timestamp
 touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
 cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
+
 # Isolinux setup including config and help files comes from d-i.
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
-if [ -e boot$N/isolinux/f3.txt.only26 ];then
-	mv boot$N/isolinux/f3.txt.only26 boot$N/isolinux/f3.txt
+if [ -e boot$N/isolinux/f3.txt.withgtk ]; then
+	extra_image gtk/initrd.gz
+	syslinux_files withgtk
 fi
+rm -f boot$N/isolinux/isolinux.cfg.with* 2>/dev/null || true
 
 if [ "$SPLASHPNG" ] ; then
 	# Insert our own splash screen.  Color index 15 is
@@ -91,6 +125,20 @@ if [ -n "$KERNEL_PARAMS" ]; then
 	sed -i "s|append |append $KERNEL_PARAMS|" boot$N/isolinux/isolinux.cfg
 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
 echo -n "boot$N " >> $N.mkisofs_opts