diff --git a/debian/changelog b/debian/changelog
index 0deb6190..4840c54b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
       proposal to the list.
     - Add some amd64 patches from Goswin: Fixed boot-amd64 and added
       some packages missing on netinsts.
+    - Port to etch previous changes I commited for sarge.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
diff --git a/tasks/exclude-etch b/tasks/exclude-etch
index 82f8efc2..c4e814ab 100644
--- a/tasks/exclude-etch
+++ b/tasks/exclude-etch
@@ -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/etch/boot-alpha b/tools/boot/etch/boot-alpha
index 7550ec20..d0c723f4 100755
--- a/tools/boot/etch/boot-alpha
+++ b/tools/boot/etch/boot-alpha
@@ -27,6 +27,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~vorlon/d-i/alpha/daily/cdrom/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -56,7 +60,10 @@ ar p $ab_deb data.tar.gz | tar zxf - -C boot$N/ ./boot/bootlx
 for image in initrd.gz vmlinuz; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" .
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+		fi
+		cp "$DI_DIR/$image" .
 	else
 	# XXX: not really 'daily'...
 		wget "$DI_WWW_HOME/$image"
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index 172bfa93..2a899695 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -22,73 +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
-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
@@ -98,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/boot/etch/boot-arm b/tools/boot/etch/boot-arm
index bd7a07a8..289af22e 100755
--- a/tools/boot/etch/boot-arm
+++ b/tools/boot/etch/boot-arm
@@ -20,6 +20,10 @@ CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~kmuto/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -38,13 +42,16 @@ cd $INSTALLDIR
 
 for subarch in bast netwinder riscpc riscstation; do
 	if [ ! "$DI_WWW_HOME" ];then
-		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom"
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		DI_DIR2="$DI_DIR/$subarch/cdrom"
 	else
-		DI_DIR="di_stuff"
-		wget -r -nd --no-parent --level=1 -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
-		rm -f "$DI_DIR"/index*
+		DI_DIR2="di_stuff"
+		wget -r -nd --no-parent --level=1 -P "$DI_DIR2" "$DI_WWW_HOME/$subarch/cdrom/"
+		rm -f "$DI_DIR2"/index*
 	fi
-	cp -a "$DI_DIR" "$subarch"
+	cp -a "$DI_DIR2" "$subarch"
 	rm -rf di_stuff
 done
 
diff --git a/tools/boot/etch/boot-hppa b/tools/boot/etch/boot-hppa
index 6fcfb2bb..a7983da6 100755
--- a/tools/boot/etch/boot-hppa
+++ b/tools/boot/etch/boot-hppa
@@ -15,6 +15,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/hppa/daily/cdrom/2.6"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -33,7 +37,9 @@ ar p "${MIRROR}/${PALODEB}" data.tar.gz | tar xz ./usr/share/palo/iplboot
 mv usr/share/palo/iplboot $CDROOT/install/iplboot
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/2.6"
+        if [ ! "$DI_DIR" ];then
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/2.6"
+        fi
 else
 	DI_DIR="di_stuff"
 	mkdir "$DI_DIR"
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index 7a4f57b0..665fe99a 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -15,6 +15,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~joeyh/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -62,7 +66,10 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do
 	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"
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/$image" "$image"
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image"
 	fi
@@ -77,7 +84,10 @@ for image in $EXTRA_DISK_IMAGES; do
 	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" || true
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/$image" "$image" || true
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"
 	fi
@@ -199,7 +209,10 @@ if [ "$NN" = "1" ]; then
 				dir=$(dirname $image)
 				mkdir -p $dir
 				if [ ! "$DI_WWW_HOME" ];then
-					cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
+					if [ ! "$DI_DIR" ];then
+					   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+					fi
+					cp "$DI_DIR/$image" "$image"
 				else
 					wget "$DI_WWW_HOME/$image" -O "$image"
 				fi
@@ -223,6 +236,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
diff --git a/tools/boot/etch/boot-ia64 b/tools/boot/etch/boot-ia64
index 16eb2bca..620a4d0a 100755
--- a/tools/boot/etch/boot-ia64
+++ b/tools/boot/etch/boot-ia64
@@ -15,6 +15,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/ia64/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -32,8 +36,11 @@ fi
 for image in boot.img; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" . || \
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" .
+        	if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/cdrom/$image" . || \
+		cp "$DI_DIR/$image" .
 	else
 		wget "$DI_WWW_HOME/cdrom/$image" || \
 		wget "$DI_WWW_HOME/$image"
diff --git a/tools/boot/etch/boot-m68k b/tools/boot/etch/boot-m68k
index 8fcce448..dad0f150 100755
--- a/tools/boot/etch/boot-m68k
+++ b/tools/boot/etch/boot-m68k
@@ -14,12 +14,12 @@ N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
 
-# the ! case further down doesn't seem to work.
-#if [ ! "$DI_WWW_HOME" ];then
-#	DI_WWW_HOME="default" 
-#fi
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 elif [ "$DI_WWW_HOME" = "test" ];then
    DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/test/cd/"
 fi
@@ -27,7 +27,6 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
 DI_BOOTLOADER="http://people.debian.org/~smarenka/d-i"
 
 cd $CDDIR/..
@@ -57,41 +56,11 @@ cd $INSTALLDIR
 
 if [ ! "$DI_WWW_HOME" ];then
 	if [ ! $DI_DIR ]; then
-		echo "Rats, can't find: $DI_DIR!"
+		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
 	fi
 	cp -a $DI_DIR/* .
-
-#	SUBARCHS=`find "$DI_DIR/*" -type d -print | sed -e 's,.*/,,'`
-#	for subarch in $SUBARCHS; do
-#		echo "subarch: $subarch"
-#		mkdir $subarch
-#		cp -a "$DI_DIR"/$subarch/* $subarch
-#	done
-#	cp "$DI_DIR/cdrom-initrd.gz" root.bin
-#	if [ -f "$DI_DIR/cdrom22-initrd.gz" ]; then 
-#		cp "$DI_DIR/cdrom22-initrd.gz" root22.bin
-#	fi
-#	cp "$DI_DIR/MANIFEST" .
 else
 	wget -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME"
-
-#	SUBARCHS=$(wget -q "$DI_WWW_HOME/" -O - | \
-#		sed -n -e 's/.*>\(.*\)\/<.*/\1/p')
-
-#	for subarch in $SUBARCHS; do
-#		echo "subarch: $subarch"
-#		mkdir $subarch
-#		cd $subarch
-#		wget -q -np -nd -r -l 1 -R '.gif' "$DI_WWW_HOME/$subarch"
-#		rm index*
-#		cd ..
-#	done
-#	wget -O root.bin "$DI_WWW_HOME/cdrom-initrd.gz"
-#	if ! wget -O root22.bin "$DI_WWW_HOME/cdrom22-initrd.gz" ; then
-#		rm root22.bin
-#	fi
-#	wget -O MANIFEST "$DI_WWW_HOME/MANIFEST"
-
 fi
 
 SUBARCHS=`grep vmlinu MANIFEST | cut -d'-' -f3 | sort -u | awk '{printf "%s ", $1}'`
diff --git a/tools/boot/etch/boot-mips b/tools/boot/etch/boot-mips
index 902834ba..9a4cf557 100755
--- a/tools/boot/etch/boot-mips
+++ b/tools/boot/etch/boot-mips
@@ -15,6 +15,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~ths/d-i/images/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -28,7 +32,9 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
 fi
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        if [ ! "$DI_DIR" ];then
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        fi
 else
 	DI_DIR="di_stuff"
 	wget -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img"
diff --git a/tools/boot/etch/boot-mipsel b/tools/boot/etch/boot-mipsel
index bdd43295..ccad800d 100755
--- a/tools/boot/etch/boot-mipsel
+++ b/tools/boot/etch/boot-mipsel
@@ -23,6 +23,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~tbm/d-i/images/mipsel/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -46,7 +50,9 @@ install -m 644 -D $BASEDIR/data/etch/delo.conf "$CDROOT"/etc/delo.conf
 install -m 644 -D "$DELOROOT"/boot/delo.2nd "$CDROOT"/boot/delo.2nd
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/"
+	if [ ! "$DI_DIR" ];then
+	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/"
+	fi
 else
         DI_DIR="."
         wget "$DI_WWW_HOME" -O di.dir
diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc
index 0ab6059f..f89127e8 100755
--- a/tools/boot/etch/boot-powerpc
+++ b/tools/boot/etch/boot-powerpc
@@ -15,6 +15,10 @@ CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~luther/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -87,9 +91,12 @@ cp $BASEDIR/data/etch/yaboot/ofboot.b ofboot.b
 for subarch in powerpc power3 power4
 do
   if [ ! "$DI_WWW_HOME" ];then
-  	cp -a "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom" "$subarch"
+        if [ ! "$DI_DIR" ];then 
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        fi
+  	cp -a "$DI_DIR/$subarch/cdrom" "$subarch"
 	if [ "$subarch" = "powerpc" ]; then
-		cp -a "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom-minimal" "$subarch/minimal" || true
+		cp -a "$DI_DIR/$subarch/cdrom-minimal" "$subarch/minimal" || true
 	else
 		# Supported for netboot only on POWER3 and POWER4.
 		rm -rf "$subarch/2.4"
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index 72377d83..89981d90 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -12,6 +12,10 @@ N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~stappers/d-i/images/daily/cdrom"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -52,7 +56,9 @@ cat $BASEDIR/data/etch/sparc/debian.txt \
 # uncompress it before hand.
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+	if [ ! "$DI_DIR" ];then
+	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+	fi
 else
 	DI_DIR="."
 	wget "$DI_WWW_HOME" -O di.dir