diff --git a/data/sparc/etc/boot-msg.txt b/data/sparc/etc/boot-msg.txt
deleted file mode 100644
index 263c42a3..00000000
--- a/data/sparc/etc/boot-msg.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-FIXME: need info on device naming
diff --git a/data/sparc/etc/debian.txt b/data/sparc/etc/debian.txt
index bebfb255..01baf2a5 100644
--- a/data/sparc/etc/debian.txt
+++ b/data/sparc/etc/debian.txt
@@ -5,11 +5,6 @@ This is the Debian Install CD. Keep it once you have installed your
 system, as you can boot from it to repair the system on your hard disk if
 that ever becomes necessary.
 
-In order to proceed, you must tell the SILO bootloader the CDROM type. Press
-either 'I' (for IDE CDROM drives) or 'S' (for SCSI CDROM drives) below. If
-neither of these works, then you will need to type in the full name of the
-actual device. Pressing 'O' will give you more info on device naming.
-
 WARNING: You should completely back up all of your hard disks before
   proceeding. The installation procedure can completely and irreversibly
   erase them! If you haven't made backups yet, remove the rescue CD from
@@ -18,4 +13,4 @@ WARNING: You should completely back up all of your hard disks before
 Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
 by applicable law.
 
-[ S - SCSI ]  [ I - IDE ]  [ O - OTHER ] -- This CD uses Linux 2.2.15
+[ ENTER - Boot install ]   [ Type "rescue" - Boot into rescue mode ]
diff --git a/data/sparc/etc/silo.conf b/data/sparc/etc/silo.conf
index 0115f16a..f6aaaa6e 100644
--- a/data/sparc/etc/silo.conf
+++ b/data/sparc/etc/silo.conf
@@ -1,36 +1,21 @@
 partition=1
 timeout=600
 read-only
-message=/etc/debian.txt
-default=welcome
+message=/boot/debian.txt
+default=linux
 append="cdrom"
-image[sun4c,sun4d,sun4m]=/boot/sun4cdm/linux
-   label=s
-   alias=scsi
-   single-key
-   root=/dev/scd0
-image[sun4u]=/boot/sun4u/linux
-   label=s
-   alias=scsi
-   single-key
-   root=/dev/scd0
-image[sun4c,sun4d,sun4m]=/boot/sun4cdm/linux
-   label=i
-   alias=ide
-   single-key
-   root=/dev/hdc
-image[sun4u]=/boot/sun4u/linux
-   label=i
-   alias=ide
-   single-key
-   root=/dev/hdc
-image="cat /etc/boot-msg.txt"
-   label=o
-   alias=other
-   single-key
-image="cat /etc/debian.txt"
-   label=welcome
-image[sun4c,sun4d,sun4m]=/boot/sun4cdm/linux
+initrd=/root.bin
+
+# Standard boot images
+image[sun4c,sun4d,sun4m]=/boot/sparc32.gz
    label=linux
-image[sun4u]=/boot/sun4u/linux
+image[sun4u]=/boot/sparc64.gz
    label=linux
+
+# Rescue boots
+image[sun4c,sun4d,sun4m]=/boot/sparc32.gz
+  label=rescue
+  append="init=/bin/sh"
+image[sun4u]=/boot/sparc64.gz
+  label=rescue
+  append="init=/bin/sh"
diff --git a/tools/boot/woody/boot-sparc b/tools/boot/woody/boot-sparc
index b27f6a5b..f3dbb0bb 100755
--- a/tools/boot/woody/boot-sparc
+++ b/tools/boot/woody/boot-sparc
@@ -27,13 +27,13 @@ fi
 
 install_languages $CDDIR
 
-echo "-B boot/second.b boot1" > $N.mkisofs_opts
+echo "-silo-boot boot/second.b -s boot/silo.conf -S boot/cd.b boot1" > $N.mkisofs_opts
 rm -rf boot1
 
 inst=boot1
 
 # Setup directories
-mkdir -p $inst/{boot/sun4{u,cdm},etc}
+mkdir -p $inst/boot
 
 silo_deb=`ls $MIRROR/pool/main/s/silo/silo_*.deb | tail -1`
 # put the relevant parts of SILO boot loader
@@ -41,24 +41,13 @@ silo_deb=`ls $MIRROR/pool/main/s/silo/silo_*.deb | tail -1`
 	tar zxf - -C $inst/ ./boot/{cd,second}.b)
 
 # Some custom etc files
-cp -f -p $BASEDIR/data/sparc/etc/{boot-msg.txt,debian.txt,silo.conf} \
-	$inst/etc/
+cp -f -p $BASEDIR/data/sparc/etc/{debian.txt,silo.conf} \
+	$inst/boot/
 
-tmp=$TDIR/sparc-root
-rm -rf $tmp
-mkdir -p $tmp
-
-for suba in sun4cdm sun4u; do
-  ln -s ../../dists/$CODENAME/main/disks-$ARCH/current/$suba/linux-a.out \
-	$inst/boot/$suba/linux
-done
-
-# Unpack the root tree into the directory. we use the tftp root.tar.gz
-tar zxf $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/root.tar.gz -C $tmp/
-cp -f -a $tmp/debian-sparc-root/. $inst/
+cp ../../dists/$CODENAME/main/disks-$ARCH/current/sun4cdm/vmlinuz \
+	$inst/boot/sparc32.gz
+cp ../../dists/$CODENAME/main/disks-$ARCH/current/sun4u/vmlinuz \
+	$inst/boot/sparc64.gz
 
 # no longer need this
 rm -rf $tmp
-
-# Get rid of some junk
-rm -f $inst/{boot_message,type.txt}