diff --git a/anaconda-11.4.0.83-more-sparc-fixes.patch b/anaconda-11.4.0.83-more-sparc-fixes.patch
index 88f641e..ca10ba2 100644
--- a/anaconda-11.4.0.83-more-sparc-fixes.patch
+++ b/anaconda-11.4.0.83-more-sparc-fixes.patch
@@ -1,6 +1,6 @@
 diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.spot anaconda-11.4.0.83/scripts/mk-images.sparc
 --- anaconda-11.4.0.83/scripts/mk-images.sparc.spot	2008-10-01 21:32:11.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/mk-images.sparc	2008-10-02 17:37:59.000000000 -0400
++++ anaconda-11.4.0.83/scripts/mk-images.sparc	2008-10-03 14:59:44.000000000 -0400
 @@ -52,52 +52,51 @@ maketftp() {
      fi
  }
@@ -94,7 +94,7 @@ diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.spot anaconda-11.4.0.83/scri
  }
 diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk-images
 --- anaconda-11.4.0.83/scripts/mk-images.spot	2008-10-01 21:32:11.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/mk-images	2008-10-02 17:37:59.000000000 -0400
++++ anaconda-11.4.0.83/scripts/mk-images	2008-10-03 15:57:03.000000000 -0400
 @@ -128,7 +128,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
  	KERNELDIR="/boot"
      fi
@@ -113,6 +113,18 @@ diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk
  	CRAMBS="--blocksize 8192"
      elif [ "$BUILDARCH" = "sparc" ]; then
  	CRAMBS="--blocksize 4096"
+@@ -198,9 +198,9 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
+ 
+     if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
+        # go ahead and create the keymaps so we only have to do it once
+-       if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH ]; then
++       if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH ]; then
+ 	   echo "Found keymap override, using it"
+-	   cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS
++	   cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH $KEYMAPS
+        else
+ 	   echo "Running: $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH"
+ 	   $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH
 @@ -734,6 +734,8 @@ elif [ ${BUILDARCH} = ppc64 ]; then
  elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then
      source $TOPDIR/mk-images.x86
@@ -126,14 +138,14 @@ diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk
  elif [ "$BUILDARCH" = "ia64" ]; then
      kerneltags="kernel kernel-xen"
      efiarch="ia64"
-+elif [ "$BUILDARCH" = "sparcv9" -o "$BUILDARCH" = "sparc64"]; then
++elif [ "$BUILDARCH" = "sparcv9" -o "$BUILDARCH" = "sparc64" ]; then
 +    arches="sparc64"
  fi
  
  foundakernel=""
 diff -up anaconda-11.4.0.83/scripts/upd-instroot.spot anaconda-11.4.0.83/scripts/upd-instroot
---- anaconda-11.4.0.83/scripts/upd-instroot.spot	2008-10-02 17:38:46.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/upd-instroot	2008-10-02 17:43:07.000000000 -0400
+--- anaconda-11.4.0.83/scripts/upd-instroot.spot	2008-10-01 21:32:11.000000000 -0400
++++ anaconda-11.4.0.83/scripts/upd-instroot	2008-10-03 15:59:05.000000000 -0400
 @@ -198,7 +198,7 @@ if [ $ARCH = ppc -o $ARCH = ppc64 ]; the
      PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
  fi
@@ -152,20 +164,26 @@ diff -up anaconda-11.4.0.83/scripts/upd-instroot.spot anaconda-11.4.0.83/scripts
      PACKAGESGR="$PACKAGESGR tilo silo"
  fi
  
-@@ -1050,10 +1050,12 @@ for p in $DEST $DESTGR; do
+@@ -312,6 +312,7 @@ KEEPFILE=${TMPDIR:-/tmp}/keepfile.$$
+ cat > $KEEPFILE <<EOF
+ boot/efi/EFI/redhat/elilo.efi
+ boot/efi/EFI/redhat/grub.efi
++boot/*.b
+ bin/bash
+ bin/dbus-daemon
+ bin/fdisk*
+@@ -1050,11 +1051,10 @@ for p in $DEST $DESTGR; do
  	done
  
  	# copy bootloader files for sparc
 -	if [ $ARCH = sparc -a $p = $DESTGR ]; then
--	    mkdir -p $p/usr/lib/anaconda-runtime/boot
++	if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
+ 	    mkdir -p $p/usr/lib/anaconda-runtime/boot
 -	    [ -d $p/boot ] || die "ERROR: directory missing: $p/boot"
 -	    (cd $p/boot; find -name "*.b") | (cd $p/boot; /bin/cpio --quiet -pdmu $p/usr/lib/anaconda-runtime/boot)
-+	if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
-+	    if [ $p = $DESTGR ]; then
-+		mkdir -p $p/usr/lib/anaconda-runtime/boot
-+		[ -d $p/boot ] || die "ERROR: directory missing: $p/boot"
-+		(cd $p/boot; find -name "*.b") | (cd $p/boot; /bin/cpio --quiet -pdmu $p/usr/lib/anaconda-runtime/boot)
-+	    fi
-         fi
+-        fi
++	    cp -af $p/boot/*.b $p/usr/lib/anaconda-runtime/boot
++	fi
  
  	# copy bootloader file for ppc
+ 	if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
diff --git a/anaconda.spec b/anaconda.spec
index 5cc7e9a..ede867f 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 4
+Release: 5
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -214,6 +214,9 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 02 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-5
+- still more sparc fixes
+
 * Thu Oct 02 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-4
 - fix sparc conditionals in upd-instroot