5765e470aec1fd6256bf91ef78b84f473a62e81d
diff --git a/pilgrim b/pilgrim
index 79a72c4..c0f2720 100755
--- a/pilgrim
+++ b/pilgrim
@@ -581,7 +581,7 @@ if [ "$FILE_SYSTEM" = "iso9660" ] ; then
     else
 	cp $INSTALL_ROOT/boot/initrd* out/boot/initrd
     fi
-    cp $INSTALL_ROOT/usr/share/grub/i386-redhat/stage2_eltorito out/boot/grub/
+    cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/stage2_eltorito out/boot/grub/
     cp $INSTALL_ROOT/boot/grub/splash.xpm.gz out/boot/grub/
 
     if [ "$USE_SELINUX" != "0" ] ; then
diff --git a/streams.d/fedora-base.stream b/streams.d/fedora-base.stream
index 4a1c67a..17decea 100644
--- a/streams.d/fedora-base.stream
+++ b/streams.d/fedora-base.stream
@@ -159,9 +159,9 @@ #    perl -i -p -e 's/SELINUX=enforcing/
     if [ "$FILE_SYSTEM" == "ext3" ] || [ "$FILE_SYSTEM" == "iso9660" ] ; then
 	echo "  - Copying grub boot loader files to /boot"
 	mkdir -p $INSTALL_ROOT/boot/grub
-	cp $INSTALL_ROOT/usr/share/grub/i386-redhat/stage1 $INSTALL_ROOT/boot/grub/
-	cp $INSTALL_ROOT/usr/share/grub/i386-redhat/stage2 $INSTALL_ROOT/boot/grub/
-	cp $INSTALL_ROOT/usr/share/grub/i386-redhat/e2fs_stage1_5 $INSTALL_ROOT/boot/grub/
+	cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/stage1 $INSTALL_ROOT/boot/grub/
+	cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/stage2 $INSTALL_ROOT/boot/grub/
+	cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/e2fs_stage1_5 $INSTALL_ROOT/boot/grub/
 	pilgrim_restore_context /boot/grub/stage1
 	pilgrim_restore_context /boot/grub/stage2
 	pilgrim_restore_context /boot/grub/e2fs_stage1_5
diff --git a/streams.d/olpc-development.stream b/streams.d/olpc-development.stream
index 808ff22..d50ccc4 100644
--- a/streams.d/olpc-development.stream
+++ b/streams.d/olpc-development.stream
@@ -437,9 +437,9 @@ EOF
 	ext3|devel_ext3)
 	    echo "  - Copying grub boot loader files"
 	    mkdir -p $INSTALL_ROOT/boot/grub
-	    cp $INSTALL_ROOT/usr/share/grub/i386-redhat/stage1 $INSTALL_ROOT/boot/grub/
-	    cp $INSTALL_ROOT/usr/share/grub/i386-redhat/stage2 $INSTALL_ROOT/boot/grub/
-	    cp $INSTALL_ROOT/usr/share/grub/i386-redhat/e2fs_stage1_5 $INSTALL_ROOT/boot/grub/
+	    cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/stage1 $INSTALL_ROOT/boot/grub/
+	    cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/stage2 $INSTALL_ROOT/boot/grub/
+	    cp $INSTALL_ROOT/usr/share/grub/$(uname -i)-redhat/e2fs_stage1_5 $INSTALL_ROOT/boot/grub/
 
 
 	    echo "  - Configuring grub boot loader"