diff --git a/tools/boot/potato/boot-alpha b/tools/boot/potato/boot-alpha
index 0bbf9d10..2485dc43 100755
--- a/tools/boot/potato/boot-alpha
+++ b/tools/boot/potato/boot-alpha
@@ -29,7 +29,7 @@ echo -n "-J boot1" > $N.mkisofs_opts
 
 # Use the generic linux image
 cp -f $CDDIR/dists/stable/main/disks-$ARCH/current/linux \
-	boot1/boot/linux
+	boot1/$kernel
 
 # Copy over the subarch boot-loaders
 mkdir boot1/milo
@@ -41,6 +41,18 @@ mkdir boot1/apb
 cp -f $CDDIR/dists/stable/main/disks-$ARCH/current/APB/* \
 	boot1/apb/
 
+# And aboot
+cp -f $CDDIR/dists/stable/main/disks-$ARCH/current/bootlx \
+	boot1/boot/bootlx
+cp -f $CDDIR/dists/stable/main/disks-$ARCH/current/images-1.44/root.bin \
+	boot1/boot/root.bin
+mkdir -p boot1/etc
+cat <<EOF > boot1/etc/aboot.conf
+0:boot/linux root=/dev/ram initrd=boot/root.bin
+1:boot/linux root=/dev/ram initrd=boot/root.bin console=ttyS0
+2:boot/linux root=/dev/ram initrd=boot/root.bin console=ttyS1
+EOF
+
 mkdir $CDDIR/tools/rawrite1
 (cd $CDDIR/tools/rawrite1; \
    unzip -Lq $MIRROR/tools/rawrite1.zip )
diff --git a/tools/boot/potato/post-boot-alpha b/tools/boot/potato/post-boot-alpha
new file mode 100644
index 00000000..a6dc8218
--- /dev/null
+++ b/tools/boot/potato/post-boot-alpha
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# post-boot-alpha, by David Huggins-Daines <dhd@linuxcare.com>
+#
+# You may copy, modify and distribute this under the terms of the GNU
+# General Public License, included herein by reference.  See COPYING.
+#
+# Do post-image-building tasks for alpha to make CDs bootable
+
+set -e
+
+N=$1
+CDROOT=$2
+CDIMAGE=$3
+
+# Only disk 1 is bootable
+if [ $N != 1 -a $N != 1_NONUS ]; then
+    exit 0
+fi
+
+isomarkboot $CDIMAGE /boot/bootlx
\ No newline at end of file