diff --git a/efibootmgr-0.5.4-default-to-grub.patch b/efibootmgr-0.5.4-default-to-grub.patch
new file mode 100644
index 0000000..5e8525b
--- /dev/null
+++ b/efibootmgr-0.5.4-default-to-grub.patch
@@ -0,0 +1,44 @@
+From 836e58668167e82c5ffcb66f3f390d2c52217f6a Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 14 Apr 2010 16:06:48 -0400
+Subject: [PATCH] Make \EFI\redhat\grub.efi the default bootloader (#579665)
+
+Make \EFI\redhat\grub.efi the default bootloader instead of \elilo.efi .
+---
+ src/efibootmgr/efibootmgr.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
+index 5db0d9e..b984143 100644
+--- a/src/efibootmgr/efibootmgr.c
++++ b/src/efibootmgr/efibootmgr.c
+@@ -18,7 +18,7 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ 
+-  This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi
++  This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/redhat/grub.efi
+   The  EFI_DEVICE_PATH will look something like:
+     ACPI device path, length 12 bytes
+     Hardware Device Path, PCI, length 6 bytes
+@@ -779,7 +779,7 @@ usage()
+ 	printf("\t-g | --gpt            force disk with invalid PMBR to be treated as GPT\n");
+ 	printf("\t-H | --acpi_hid XXXX  set the ACPI HID (used with -i)\n");
+ 	printf("\t-i | --iface name     create a netboot entry for the named interface\n");
+-	printf("\t-l | --loader name     (defaults to \\elilo.efi)\n");
++	printf("\t-l | --loader name     (defaults to \\EFI\\redhat\\grub.efi)\n");
+ 	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\")\n");
+ 	printf("\t-n | --bootnext XXXX   set BootNext to XXXX (hex)\n");
+ 	printf("\t-N | --delete-bootnext delete BootNext\n");
+@@ -807,7 +807,7 @@ set_default_opts()
+ 	opts.active          = -1;   /* Don't set it */
+ 	opts.timeout         = -1;   /* Don't set it */
+ 	opts.edd10_devicenum = 0x80;
+-	opts.loader          = "\\elilo.efi";
++	opts.loader          = "\\EFI\\redhat\\grub.efi";
+ 	opts.label           = "Linux";
+ 	opts.disk            = "/dev/sda";
+ 	opts.iface           = NULL;
+-- 
+1.7.0.1
+
diff --git a/efibootmgr.spec b/efibootmgr.spec
index aca45ee..259a863 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,7 +1,7 @@
 Summary: EFI Boot Manager
 Name: efibootmgr
 Version: 0.5.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://linux.dell.com/%{name}/
@@ -15,6 +15,7 @@ Conflicts: elilo <= 3.6-5
 Obsoletes: elilo <= 3.6-5
 
 Source0: http://linux.dell.com/%{name}/permalink/%{name}-%{version}.tar.gz
+Patch0: efibootmgr-0.5.4-default-to-grub.patch
 
 %description
 %{name} displays and allows the user to edit the Intel Extensible
@@ -24,6 +25,7 @@ http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/.
 
 %prep
 %setup -q
+%patch0 -p1 -b .grub-default
 
 %build
 make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}'
@@ -46,6 +48,10 @@ rm -rf %{buildroot}
 %doc README INSTALL COPYING
     
 %changelog
+* Wed Apr 14 2010 Peter Jones <pjones@redhat.com> - 0.5.4-8
+- Make \EFI\redhat\grub.efi the default bootloader
+  Resolves: rhbz#579665
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild