diff --git a/data/lenny/sparc/silo.conf b/data/lenny/sparc/silo.conf
index c8f17134..defa1c33 100644
--- a/data/lenny/sparc/silo.conf
+++ b/data/lenny/sparc/silo.conf
@@ -26,26 +26,3 @@ image[sun4u]=/boot/sparc64
    label=auto
    initrd=/boot/initrd.gz
    append="auto=true priority=critical"
-
-### sparc32 boot images
-#image[sun4c,sun4d,sun4m]=/boot/sparc32
-#   label=install
-#   initrd=/boot/initrd.gz
-
-# sparc32 expert boots
-#image[sun4c,sun4d,sun4m]=/boot/sparc32
-#   label=expert
-#   initrd=/boot/initrd.gz
-#   append="debconf/priority=low"
-
-# sparc32 rescue boots
-#image[sun4c,sun4d,sun4m]=/boot/sparc32
-#   label=rescue
-#   initrd=/boot/initrd.gz
-#   append="rescue/enable=true"
-
-# sparc32 auto-install boots
-#image[sun4c,sun4d,sun4m]=/boot/sparc32
-#   label=auto
-#   initrd=/boot/initrd.gz
-#   append="auto=true priority=critical"
diff --git a/debian/changelog b/debian/changelog
index cb8bd515..99a5f5e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,12 +42,12 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
     transitioning in the installer.
   * Exclude live-installer, simple-cdd, pwgen and nbd udebs as they are
     currently not used in Debian Installer.
-  * Disable sparc32 for Lenny images as it is no longer supported.
+  * Remove support for sparc32 as it is no longer supported for Lenny.
 
   [ Steve McIntyre ]
   * Update unstable-map: in the Makefile - use lenny rather than etch
 
- -- Frans Pop <fjp@debian.org>  Wed, 18 Jul 2007 01:05:42 +0200
+ -- Frans Pop <fjp@debian.org>  Thu, 26 Jul 2007 03:19:01 +0200
 
 debian-cd (3.0.2) unstable; urgency=high
 
diff --git a/tools/boot/lenny/boot-sparc b/tools/boot/lenny/boot-sparc
index bdaa5134..12372c35 100755
--- a/tools/boot/lenny/boot-sparc
+++ b/tools/boot/lenny/boot-sparc
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 # 
-# boot-sparc etch+
+# boot-sparc lenny+
 #
 # Do install stuff for sparc, including making first CD bootable
 
@@ -11,7 +11,7 @@ set -e
 N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://people.debian.org/~stappers/d-i/images/daily/cdrom"
+   DI_WWW_HOME="http://people.debian.org/~stappers/d-i/images/daily"
    if [ -n "$DI_DIR" ];then
       DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
       DI_WWW_HOME=""                     
@@ -45,32 +45,38 @@ silo_deb=$MIRROR/`zcat $MIRROR/dists/$DI_CODENAME/main/binary-sparc/Packages.gz
 	tar zxf - -C $inst/ ./boot/{isofs,second}.b)
 
 # Some custom etc files
-cp -f -p $BASEDIR/data/etch/sparc/silo.conf $inst/boot/
-cat $BASEDIR/data/etch/sparc/debian.txt \
+cp -f -p $BASEDIR/data/lenny/sparc/silo.conf $inst/boot/
+cat $BASEDIR/data/lenny/sparc/debian.txt \
  | sed "s/\${MEDIA_TYPE}/CDROM/" \
  | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
  | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
  > $inst/boot/debian.txt
 
-# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
-# uncompress it before hand.
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz"
 
-if [ ! "$DI_WWW_HOME" ];then
-	if [ ! "$DI_DIR" ];then
-	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+# Download boot images.
+for image in $BOOT_IMAGES; do
+    if [ ! -e "$image" ]; then
+	dir=$(dirname $image)
+	mkdir -p $dir
+	if [ -n "$LOCAL"  -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/
+current/images/$image" ]; then
+		cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/image
+s/$image" "$image"
+	elif [ ! "$DI_WWW_HOME" ];then
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+#		echo "Copying images from $DI_DIR"
+		cp "$DI_DIR/$image" "$image"
+	else
+		wget "$DI_WWW_HOME/$image" -O "$image"
 	fi
-else
-	DI_DIR="."
-	mkdir ./2.6
-	DI_WWW_HOME=$DI_WWW_HOME/2.6
-	wget "$DI_WWW_HOME" -O ./2.6/di.dir
-	#sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' ./2.6/di.dir)
-	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./2.6/di.dir)
-	#wget "$DI_WWW_HOME/$sparc32" -O ./2.6/vmlinuz-x-sparc32
-	wget "$DI_WWW_HOME/$sparc64" -O ./2.6/vmlinuz-x-sparc64
-	wget "$DI_WWW_HOME/initrd.gz" -O ./2.6/initrd.gz
-fi
+    fi
+done
 
-cp "$DI_DIR"/2.6/initrd.gz "$inst/boot/initrd.gz"
-#cp "$DI_DIR"/2.6/vmlinuz-*-sparc32 "$inst/boot/sparc32"
-zcat "$DI_DIR"/2.6/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
+# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
+# uncompress it beforehand.
+
+cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
+zcat "$DI_DIR"/vmlinuz > "$inst/boot/sparc64"