diff --git a/tools/boot/potato/boot-i386 b/tools/boot/potato/boot-i386
index 5fa3f0dc..87bc50fe 100755
--- a/tools/boot/potato/boot-i386
+++ b/tools/boot/potato/boot-i386
@@ -6,6 +6,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
 #
 # Do install stuff for i386, including making bootable CDs
 #
@@ -23,10 +24,11 @@ cd $CDDIR/..
 # Compact image for disk 2
 if [ $N == 2 ]; then
 	:> 2.mkisofs_opts
-	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin ] 
+	rm -r $CDDIR/doc        #remove doc dir on #2,#3,#4
+	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin ] 
 	then
 	  mkdir -p boot2/boot
-	  cp 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin boot2/boot/
+	  cp 1/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
@@ -36,6 +38,7 @@ fi
 # Disks != 1 and not 2
 if [ $N != 1 ]; then 
 	echo -n "-J" > $N.mkisofs_opts
+        rm -r $CDDIR/doc        #remove doc dir on #2,#3,#4
 	exit 0; 
 fi
 
@@ -45,47 +48,28 @@ fi
 echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot1" > 1.mkisofs_opts
 
 (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
-	cp disks-2.88/resc*.bin  $CDDIR/install ; \
+	cp images-1.44/resc*.bin  $CDDIR/install ; \
 	cp linux  $CDDIR/install ; \
-	cp disks-1.44/root.bin $CDDIR/install )
+	cp images-1.44/root.bin $CDDIR/install )
 
 mkdir -p boot1/boot
 
-cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/rescue.bin boot1/boot
+cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/rescue.bin boot1/boot
 
 
 #Extracting tools for disc 1
 
-mkdir -p $CDDIR/tools/fips20
-(cd $CDDIR/tools/fips20; \
-	unzip -Lq $MIRROR/tools/fips20.zip >/dev/null; \
-	rm restorrb source -rf)
+mkdir -p $CDDIR/install/dosutils
 
-(cd $CDDIR/tools; \
-	unzip -Lq $MIRROR/tools/lodlin16.zip >/dev/null; \
-	rm lodlin16/src lodlin16/initrd loadlin16/debian -rf )
+(cd $CDDIR/dosutils; \
+cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/dosutils/* $CDDIR/install/dosutils)
 
-mkdir $CDDIR/tools/rawrite1
-(cd $CDDIR/tools/rawrite1; \
-	unzip -Lq $MIRROR/tools/rawrite1.zip >/dev/null)
-
-mkdir $CDDIR/tools/rawrite2
-(cd $CDDIR/tools/rawrite2; \
-	unzip -Lq $MIRROR/tools/rawrite2.zip >/dev/null; \
-	rm rawrite2.c )
 
 (echo "Tools for DOS :" ; \
-	echo "fips20/         non-destructively shorten a FAT partition" ; \
-	echo "lodlin16/       load Linux kernel from DOS" ;\
-	echo "rawrite1/       rawrite 1.3 : create disks from disk images (*.bin)"; \
+	echo "lodlin/         load Linux kernel from DOS" ;\
 	echo "rawrite2/       rawrite 2.0 : create disks from disk images (*.bin)"; \
-	echo "         rawrite 2.0 is much faster, but it locks up on some machines";\
 	) |todos > $CDDIR/tools/README.tools
 
-cp $CDDIR/tools/lodlin16/*.exe $CDDIR/install
-cp $CDDIR/tools/rawrite1/rawrite3.com $CDDIR/install/rw1_3.com
-cp $CDDIR/tools/rawrite2/rawrite2.exe $CDDIR/install/rw2_0.exe
-cp $CDDIR/tools/fips*/*.exe $CDDIR/install
 
 (echo "@ echo off" ; \
 	echo "rem Flush any write-cached disk blocks before we leave DOS. " ; \