Index: tools/boot/lenny/boot-x86
===================================================================
--- tools/boot/lenny/boot-x86	(revision 1454)
+++ tools/boot/lenny/boot-x86	(working copy)
@@ -55,10 +55,13 @@
 
 THISTYPE=${KTYPE[$NN]}
 
+INSTALLDIR_i386="install.386"
+INSTALLDIR_amd64="install.amd"
+
 if [ "$ARCH" = i386 ]; then
-	INSTALLDIR="install.386"
+	INSTALLDIR="$INSTALLDIR_i386"
 else
-	INSTALLDIR="install.amd"
+	INSTALLDIR="$INSTALLDIR_amd64"
 fi
 
 BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
@@ -178,6 +181,8 @@
 
 	sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/isolinux.cfg
 
+	sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini
+
 	cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/$ISOLINUXDIR/
 
 	if [ -n "$KERNEL_PARAMS" ]; then
@@ -207,6 +212,9 @@
 			/[Kk][Ee][Rr][Nn][Ee][Ll]/ { print $0 }
 			/[Aa][Pp][Pp][Ee][Nn][Dd]/ { print $0 }' >> boot$N/isolinux/isolinux.cfg
 
+		sed -i -e "/^arch=/d ; /^i386\//p; s/^i386\//amd64\//; s/=$INSTALLDIR_i386\//=$INSTALLDIR_amd64\//g" \
+			boot$N/win32-loader.ini
+
 	else
 		if [ "$ARCH" = amd64 ]; then
 		        mkdir -p boot$N/isolinux