diff --git a/tools/boot/potato/boot-i386 b/tools/boot/potato/boot-i386
index 1cf0b0a3..c07dc476 100755
--- a/tools/boot/potato/boot-i386
+++ b/tools/boot/potato/boot-i386
@@ -7,6 +7,7 @@
 # Heavily hacked by Raphaël Hertzog <hertzog@debian.org> for
 # YACS (the new debian-cd in potato)
 # 12MAR00  updated for current i386 bootdisks  --jwest
+# 02JAN01  cd1=default-kern, cd2=compact-kern, cd3=idepci-kern --jwest
 #
 # Do install stuff for i386, including making bootable CDs
 #
@@ -21,39 +22,56 @@ BOOTDIR=
 
 cd $CDDIR/..
 
-# Compact image for disk 2
-if [ $N == 2 ]; then
-	:> 2.mkisofs_opts
-	if [ -e CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin ] 
-	then
-	  mkdir -p boot2/boot
-	  cp -f CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin boot2/boot/
-	  echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot2" \
-		        > 2.mkisofs_opts
-	fi
-	exit 0;
-fi
+#
+# 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.
 
-# Disks != 1* and not 2
-if [ $N != 1 -a $N != 1_NONUS ]; then 
-	echo -n "-J" > $N.mkisofs_opts
-	exit 0; 
-fi
+# Strip stupid NONUS sutff
+#
+if [ $N == "1_NONUS" ] || [ $N == "1" ] ; then NN=1 ; fi
+if [ $N == "2_NONUS" ] || [ $N == "2" ] ; then NN=2 ; fi
+if [ $N == "3_NONUS" ] || [ $N == "3" ] ; then NN=3 ; fi
+if [ $N == "4_NONUS" ] || [ $N == "4" ] ; then NN=4 ; fi
+if [ $N == "5_NONUS" ] || [ $N == "5" ] ; then NN=5 ; fi
+if [ $N == "6_NONUS" ] || [ $N == "6" ] ; then NN=6 ; fi
+# NN is now 1...N so it can be used as an index
 
-# Now we do disk 1 ...
-# couple of changes for 2.2.x bootdisks 27-dec-99 -- jwest
+# what kernel-type to put on what disk?
+# a null "" value will use the default boot-disk kernel
+#
+KTYPE[1]=""
+KTYPE[2]=compact
+KTYPE[3]=idepci
+KTYPE[4]=""
+KTYPE[5]=""
+KTYPE[6]=""
 
-echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot1" > $N.mkisofs_opts
+# Show user what is going on.
+#
+echo "Using ${KTYPE[$NN]} boot-disks image on CD$N"
 
+# Put boot images on CD1...CD(N)
+#
+:> $N.mkisofs_opts
+mkdir -p boot$N/boot
+cp -f CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/${KTYPE[$NN]}/rescue.bin boot$N/boot/
+echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot$N"  > $N.mkisofs_opts
+
+
+# Only disk one gets the extra files installed
+#
+if [ $N == "1" ] || [ $N == "1_NONUS" ] ; then
+
+# populate the install directory as well
 (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
 	cp -f images-1.44/resc*.bin  $CDDIR/install ; \
 	cp -f linux  $CDDIR/install ; \
 	cp -f images-1.44/root.bin $CDDIR/install )
 
-mkdir -p boot1/boot
 
 ##	24-Mar-2000 notes from Ben Collins on using cd as live file-system
-##	for 2.2.9 bootdisks	jwest
+##	for 2.2.9 bootdisks	
 # (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/images-1.44/ ; \
 #	gzip -dc root.bin > /tmp/root.bin.uncompressed ; \
 #	mount -o loop /tmp/root.bin.uncompressed /mnt ; \
@@ -64,10 +82,10 @@ mkdir -p boot1/boot
 #	rm /tmp/root.bin.uncompressed  )
 ## end notes
 
-cp -f $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/rescue.bin boot1/boot
 
 
-#Extracting tools for disc 1
+# Tools for disc 1
+# and include the legacy DOS stuff 
 
 cp -f $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/dosutils/* $CDDIR/install/
 
@@ -81,4 +99,5 @@ cp -f $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/dosutils/* $CDDIR/install/
 	echo "smartdrv /c" ; \
 	echo "loadlin.exe linux root=/dev/ram ro initrd=root.bin" ; \
 	) |todos > $CDDIR/install/boot.bat
-
+fi
+# th,th, thats all