diff --git a/build.sh b/build.sh
index 9319c2b6..837542da 100755
--- a/build.sh
+++ b/build.sh
@@ -1,12 +1,34 @@
 #!/bin/sh
 
-set -e
+# Script to build one arch
 
 . CONF.sh
+
+[ -n "$1" ] && export ARCH=$1
+
 make distclean
 make ${CODENAME}_status
+echo " ... checking your mirror"
 make mirrorcheck
+if [ $? -gt 0 ]; then
+	echo "ERROR: Your mirror has a problem, please correct it." >&2
+	exit 1
+fi
+echo " ... selecting packages to include"
 disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
-	awk '{print $1}'`
-make list COMPLETE=1 SIZELIMIT1=$(((630 - ${disks}) * 1024 * 1024)) SRCSIZELIMIT=$((635 * 1024 * 1024))
+        awk '{print $1}'`
+if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc ]; then
+    . $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc
+fi
+SIZE_ARGS=''
+for CD in 1 2 3 4; do
+	size=`eval echo '$'"BOOT_SIZE_${CD}"`
+	[ "$size" = "" ] && size=0
+	[ $CD = "1" ] && size=$(($size + $disks))
+	SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$(((630 - $size) * 1024 *1024))"
+done
+make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$((635 * 1024 * 1024))
+echo " ... building the images"
 make official_images
+
+make imagesums
diff --git a/build_all.sh b/build_all.sh
index 9dc1e8ce..2965b199 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -20,8 +20,17 @@ do
 	echo " ... selecting packages to include"
 	disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
 	        awk '{print $1}'`
-	make list COMPLETE=1 SIZELIMIT1=$(((630 - ${disks}) * 1024 *1024)) \
-		SRCSIZELIMIT=$((635 * 1024 * 1024))
+	if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc ]; then
+	    . $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc
+	fi
+	SIZE_ARGS=''
+	for CD in 1 2 3 4; do
+		size=`eval echo '$'"BOOT_SIZE_${CD}"`
+		[ "$size" = "" ] && size=0
+		[ $CD = "1" ] && size=$(($size + $disks))
+		SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$(((630 - $size) * 1024 *1024))"
+	done
+	make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$((635 * 1024 * 1024))
 	echo " ... building the images"
 	if [ "$ARCH" = "i386" ]; then
 		make official_images
diff --git a/debian/changelog b/debian/changelog
index cac05a31..6f17bd05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ debian-cd (2.2.1) frozen unstable; urgency=low
   * Added EXTRANONFREE support. It allows to generate an extra non-free CD.
     The first CDs are totally free and the last(s) CD(s) contains 
     only non-free and possibly some files from contrib.
+  * Added extra file to help fine tune the CD sizes per archs
+  * Edited boot-alpha to work (I hope) based on what was available in the
+    README.txt in boot-floppies
 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 20 May 2000 23:42:58 +0200
 
diff --git a/tools/boot/potato/boot-alpha b/tools/boot/potato/boot-alpha
index f7933a0a..4cd12049 100755
--- a/tools/boot/potato/boot-alpha
+++ b/tools/boot/potato/boot-alpha
@@ -28,28 +28,19 @@ mkdir -p boot1/boot
 
 echo -n "-J boot1" > 1.mkisofs_opts
 
-echo "extract aboot(bootlx) from sable set"
-echo dump srmbootcode boot1/boot/bootlx |\
-     debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/sable/resc1440.bin
-for subarch in avanti avanti-s xl xlt cabriolet eb66 eb66p eb64p eb164 pc164 \
-      lx164 sx164 jensen noname takara mikasa mikasa-p noritake noritake-p alcor miata \
-           sable sable-g  book1    ruffian; do      
- mkdir boot1/boot/$subarch
- echo "drive m: file=\"$CDDIR/dists/stable/main/disks-$ARCH/current/$subarch/resc1440.bin\"" > mtoolsrc.tmp
- echo "extracting stuff for $subarch"
- case $subarch in
-          jensen|noritake*|mikasa-p|sable*|book1|miata-s|avanti-s|generic)
-       echo dump linux boot1/boot/$subarch/linux |\
-          debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/$subarch/resc1440.bin
-       ;;
-       ruffian)
-         MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:ldmilo.exe boot1/boot/$subarch/.
-   ;;         
-       *)
-         MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:linload.exe boot1/boot/$subarch/.
-   ;;
-  esac
-done
+# Use the generic linux image
+cp $CDDIR/dists/stable/main/disks-$ARCH/current/linux \
+	boot1/boot/linux
+
+# Copy over the subarch boot-loaders
+mkdir boot1/milo
+cp $CDDIR/dists/stable/main/disks-$ARCH/current/MILO/* \
+	boot1/milo/
+
+# Now the APB stuff
+mkdir boot1/apb
+cp $CDDIR/dists/stable/main/disks-$ARCH/current/APB/* \
+	boot1/apb/
 
 mkdir $CDDIR/tools/rawrite1
 (cd $CDDIR/tools/rawrite1; \
diff --git a/tools/boot/potato/boot-m68k.calc b/tools/boot/potato/boot-m68k.calc
new file mode 100644
index 00000000..a666bf25
--- /dev/null
+++ b/tools/boot/potato/boot-m68k.calc
@@ -0,0 +1,5 @@
+BOOT_SIZE_1=60
+
+BOOT_SIZE_2=20
+
+BOOT_SIZE_3=0
diff --git a/tools/boot/potato/boot-powerpc.calc b/tools/boot/potato/boot-powerpc.calc
new file mode 100644
index 00000000..da125244
--- /dev/null
+++ b/tools/boot/potato/boot-powerpc.calc
@@ -0,0 +1,5 @@
+BOOT_SIZE_1=45
+
+BOOT_SIZE_2=20
+
+BOOT_SIZE_3=0
diff --git a/tools/boot/potato/boot-sparc.calc b/tools/boot/potato/boot-sparc.calc
new file mode 100644
index 00000000..b7957676
--- /dev/null
+++ b/tools/boot/potato/boot-sparc.calc
@@ -0,0 +1,5 @@
+BOOT_SIZE_1=0
+
+BOOT_SIZE_2=0
+
+BOOT_SIZE_3=0