diff --git a/debian/changelog b/debian/changelog
index ec0a431f..0deb6190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,11 +26,13 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
       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.
+      README started. Closes: #185238
     - Make the jigdos use the same naming scheme as the isos, as per my
       proposal to the list.
+    - Add some amd64 patches from Goswin: Fixed boot-amd64 and added
+      some packages missing on netinsts.
 
--- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
 debian-cd (2.2.21) unstable; urgency=low
 
diff --git a/tasks/exclude-sarge b/tasks/exclude-sarge
index 82f8efc2..c4e814ab 100644
--- a/tasks/exclude-sarge
+++ b/tasks/exclude-sarge
@@ -94,6 +94,7 @@ kernel-image-2.6.8-9-amd64-k8
 kernel-image-2.6.8-9-amd64-generic
 kernel-image-2.6.8-9-em64t-p4-smp
 kernel-image-2.6.8-9-em64t-p4
+#ifndef ARCH_amd64
 kernel-image-2.6.8-10-em64t-p4
 kernel-image-2.6.8-10-em64t-p4-smp
 kernel-image-2.6.8-10-amd64-k8
@@ -104,6 +105,7 @@ kernel-image-2.6.8-11-em64t-p4-smp
 kernel-image-2.6.8-11-amd64-k8
 kernel-image-2.6.8-11-amd64-k8-smp
 kernel-image-2.6.8-11-amd64-generic
+#endif
 kernel-image-2.6.9-1-386
 kernel-image-2.6.9-1-686
 kernel-image-2.6.9-1-686-smp
diff --git a/tools/boot/sarge/boot-amd64 b/tools/boot/sarge/boot-amd64
index 26c05813..2a899695 100755
--- a/tools/boot/sarge/boot-amd64
+++ b/tools/boot/sarge/boot-amd64
@@ -22,74 +22,67 @@ fi
 
 cd $CDDIR/..
 
-#
 # This script is called with $1 (now $N) as the CD to 
 # make bootable.  N may be in the form "n" or "n_NONUS"
 # There may be more than 4 disks...support extras.
 
 # Strip NONUS part of disk number
 # NN will be 1...N so it can be used as an index
-#
 NN=`echo $N | sed -e 's/_NONUS//'`
 
-# List of boot image for each CD
-KTYPE[1]="" #isolinux multiboot in fact
-KTYPE[2]="cdrom"
-# XXX add net-image back when it's fixed
-KTYPE[3]=""
-KTYPE[4]=""
-KTYPE[5]=""
-KTYPE[6]=""
-KTYPE[7]=""
-KTYPE[8]=""
-KTYPE[9]=""
-KTYPE[10]=""
-
-THISTYPE=${KTYPE[$NN]}
-
-# Only sets up CD#1 for now
-if [ "$NN" != "1" ] ; then
-	exit 0
+if [ "$NN" != "1" ]; then
+  echo "CD$NN is not bootable"
+  exit 0
 fi
 
-BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
-DISK_IMAGES=""
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
 
-# Add a sid->sarge symlink for now until sarge exists separately
-ln -s sarge $CDDIR/dists/sid
-
-mkdir cdrom
-# Next 2 lines not needed for now... (SAM)
-#cp $MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/hd-media/boot.img.gz cdrom
-#gunzip cdrom/boot.img.gz
-cp $MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/cdrom/vmlinuz cdrom
-cp $MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/cdrom/initrd.gz cdrom
-cp $MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/cdrom/debian-cd_info.tar.gz cdrom
-
-if [ "$NN" = "1" ]; then
-    echo "Using ISOLINUX boot-disks image on CD$N"
-    mkdir -p boot$N/isolinux
-    cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
-    cp -lf cdrom/vmlinuz $CDDIR/install/
-    cp -lf cdrom/initrd.gz $CDDIR/install/
-    echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
-fi
-
-#install_languages $CDDIR
-
-# Only disk one gets the extra files installed
-#
-if [ "$NN" = "1" ]; then
-
-
-# populate the install directory as well
-for disk in $DISK_IMAGES; do
-	dir=$(dirname $disk)
-	mkdir -p $CDDIR/install/$dir
-	cp -lf $disk $CDDIR/install/$dir
+# Download boot images.
+for image in $BOOT_IMAGES; do
+    if [ ! -e "$image" ]; then
+	dir=$(dirname $image)
+	mkdir -p $dir
+	if [ -n "$LOCAL"  -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+		cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+	elif [ ! "$DI_WWW_HOME" ];then
+		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
+	else
+		wget "$DI_WWW_HOME/$image" -O "$image"
+	fi
+    fi
 done
 
-# ISOLINUX setup
+echo "Using ISOLINUX boot-disks image on CD$N"
+mkdir -p boot$N/isolinux
+cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
+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
+
+cat > boot$N/isolinux/isolinux.cfg <<EOF
+DEFAULT /install/vmlinuz
+APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
+LABEL linux
+  kernel /install/vmlinuz
+LABEL cdrom
+  kernel /install/vmlinuz
+LABEL expert
+  kernel /install/vmlinuz
+  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
+DISPLAY isolinux.txt
+TIMEOUT 0
+PROMPT 1
+F1 f1.txt
+F2 f2.txt
+F3 f3.txt
+F4 f4.txt
+F5 f5.txt
+F6 f6.txt
+F7 f7.txt
+F8 f8.txt
+F9 f9.txt
+F0 f10.txt
+EOF
 
 # Include Smart Boot Manager image for people where isolinux fails
 gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
@@ -99,105 +92,18 @@ cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
 # Isolinux help files come from d-i.
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
 mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
-if [ -e boot$N/isolinux/f3.txt.with26 ];then
-  mv boot$N/isolinux/f3.txt.with26 boot$N/isolinux/f3.txt
-  for image in cdrom/initrd.gz cdrom/vmlinuz; do
-    if [ ! -e "$image" ]; then
-	dir=$(dirname $image)
-	mkdir -p $dir
-	if [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
-	else
-		wget "$DI_WWW_HOME/$image" -O "$image"
-	fi
-    fi
-  done
-
-# Isolinux config file.
-cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-LABEL linux
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-LABEL cdrom
-  kernel /install/vmlinuz
-LABEL expert
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-DISPLAY isolinux.txt
-TIMEOUT 0
-PROMPT 1
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-EOF
-
-else
-
-# Isolinux config file.
-cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-LABEL linux
-  kernel /install/vmlinuz
-LABEL cdrom
-  kernel /install/vmlinuz
-LABEL expert
-  kernel /install/vmlinuz
-  append DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-DISPLAY isolinux.txt
-TIMEOUT 0
-PROMPT 1
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-EOF
-
+if [ -e boot$N/isolinux/f3.txt.only26 ];then
+	mv boot$N/isolinux/f3.txt.only26 boot$N/isolinux/f3.txt
 fi
-
-(echo "Tools for DOS :" ; \
-	echo "lodlin/         load Linux kernel from DOS" ;\
-	echo "rawrite2/       rawrite 2.0 : create disks from disk images (*.bin)"; \
-	) |todos > $CDDIR/tools/README.tools
-
-# Loadlin script for starting install via dos/windows
-(cat <<EOF;
-@ echo off
-rem Flush any write-cached disk blocks before we leave DOS. 
-If your system does not use smartdrv an error message will appear, 
-you can safely ignore that.
-smartdrv /c
-
-echo using CDROM install
-loadlin.exe vmlinuz vga=normal initrd=initrd.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-
-EOF
-) |todos > $CDDIR/install/boot.bat
-
+if [ "$SPLASHPNG" ] ; then
+	# Insert our own splash screen.  Color index 15 is
+	# background, and index 7 is foreground.  Set to black and
+	# white respecively
+	pngtopnm < $SPLASHPNG | ppmquant 16 | \
+		ppmtolss16 "#ffffff=7" "#000000=15" > boot$N/isolinux/splash.rle
 fi
 
 # write final lines to mkisofs_opts
-if [ "$NN" = "1" ]; then
-    echo -n "boot$N " >> $N.mkisofs_opts
-else
-    if [ -n "$THISTYPE" ]; then
-	echo -n "-c boot/boot.catalog boot$N "  >> $N.mkisofs_opts
-    fi
-fi
+echo -n "boot$N " >> $N.mkisofs_opts
 
 # th,th, thats all
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 38fb371c..d3e2a6f7 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -61,6 +61,10 @@ EOF
 cat >> debian-installer+kernel-$CODENAME << EOF
 #endif
 #ifdef ARCH_amd64
+discover
+discover1
+grub
+lilo
 EOF
 
 if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then