diff --git a/ChangeLog b/ChangeLog
index 1df378d5f..26d5adb64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-11  Pavel Roskin  <proski@gnu.org>
 
+	* kern/efi/efi.c (grub_exit): Add infinite loop at the end to
+	fix a gcc warning and ensure that the function won't ever exit.
+
 	* kern/i386/ieee1275/init.c: Add missing prototype for
 	grub_stop_floppy().
 
diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index 3da2beba3..8e09a90c0 100644
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -158,6 +158,7 @@ grub_exit (void)
   grub_efi_fini ();
   efi_call_4 (grub_efi_system_table->boot_services->exit,
               grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
+  for (;;) ;
 }
 
 void