diff --git a/debian/changelog b/debian/changelog
index 9849c0d5..7e789245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,14 @@ debian-cd (2.2.14) unstable; urgency=low
     Change has been made for arches where the latest bf are
     available. More may need to come for arches like sparc
     which are catching up with bf.
+  * More changes of kernel name in anticipation of the upcoming
+    boot floppies for sparc & alpha.
+  * Change the order of flavors in the i386 CD set. First is "idepci",
+    second "compact", third "bf2.4" and fourth the old default one. At
+    least we have the language chooser on the first CD but it's still
+    2.2 based. Reworked the MULTIBOOT code to take this into account.
 
- -- Raphael Hertzog <hertzog@debian.org>  Mon, 25 Mar 2002 10:53:01 +0100
+ -- Raphael Hertzog <hertzog@debian.org>  Sat,  6 Apr 2002 10:26:42 +0200
 
 debian-cd (2.2.13) unstable; urgency=low
 
diff --git a/tools/boot/woody/boot-alpha b/tools/boot/woody/boot-alpha
index fb22c950..aa9a29f5 100755
--- a/tools/boot/woody/boot-alpha
+++ b/tools/boot/woody/boot-alpha
@@ -35,7 +35,7 @@ mkdir -p boot1/boot
 FLOPPIES=$CDDIR/dists/$CODENAME/main/disks-alpha/current/
 
 # Use the generic linux image
-cp -f $FLOPPIES/linux boot1/boot/linux
+cp -f $FLOPPIES/linux.bin boot1/boot/linux
 
 # Copy over the subarch boot-loaders
 mkdir -p boot1/milo
diff --git a/tools/boot/woody/boot-i386 b/tools/boot/woody/boot-i386
index e1dc5ef9..4ecaa384 100755
--- a/tools/boot/woody/boot-i386
+++ b/tools/boot/woody/boot-i386
@@ -38,10 +38,10 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 # what kernel-type to put on what disk?
 # a null "" value will use the default boot-disk kernel
 #
-KTYPE[1]=""
+KTYPE[1]="idepci"
 KTYPE[2]="compact"
 KTYPE[3]="bf2.4"
-KTYPE[4]="idepci"
+KTYPE[4]=""
 KTYPE[5]=""
 KTYPE[6]=""
 KTYPE[7]=""
@@ -49,7 +49,7 @@ KTYPE[8]=""
 
 # Show user what is going on.
 #
-echo "Using ${KTYPE[$NN]} boot-disks image on CD$N"
+echo "Using ${${KTYPE[$NN]}:-vanilla} boot-disks image on CD$N"
 
 # Put boot images on CD1...CD(N)
 #
@@ -71,7 +71,7 @@ if [ "$N" = "1" ] || [ "$N" = "1_NONUS" ] ; then
 # The next chunk of code is only used if MULTIBOOT=yes
 # Make disk1 a multi-boot image
 # ElTorito supports multiple boot images
-# Setup all boot-disk images (currently 5)
+# Setup all boot-disk images (currently 4)
 
 
 if [ "$MULTIBOOT" = "yes" ] ; then
@@ -80,11 +80,11 @@ if [ "$MULTIBOOT" = "yes" ] ; then
     for i in 2 3 4 ; do
 	
         # first copy/link the next boot block to the disk.
-        ln CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/${KTYPE[$i]}/rescue.bin boot$N/boot/${KTYPE[$i]}.bin
+        ln CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/${KTYPE[$i]}/rescue.bin boot$N/boot/${${KTYPE[$i]}:-vanilla}.bin
         # then the eltorito-alt-boot cmd to mkisofs_opts
         echo -n "-eltorito-alt-boot " >> $N.mkisofs_opts
         # then copy the mkisofs command for this image to the mkisofs_opts
-        echo -n "-b boot/${KTYPE[$i]}.bin "  >> $N.mkisofs_opts
+        echo -n "-b boot/${${KTYPE[$i]}:-vanilla}.bin "  >> $N.mkisofs_opts
 
     done
 fi