diff --git a/ChangeLog b/ChangeLog
index 1a1be5746..a792f04e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* kern/i386/coreboot/init.c (grub_exit): Reimplement in a way that
+	doesn't cause an infinite call loop.
+
 2009-10-28  Felix Zielcke  <fzielcke@z-51.de>
 
 	* commands/acpi.c (grub_cmd_acpi): Fix the out of memory error
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 1b9ca3815..0bf4934fb 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -62,7 +62,10 @@ grub_stop_floppy (void)
 void
 grub_exit (void)
 {
-  grub_fatal ("grub_exit() is not implemented.\n");
+  /* We can't use grub_fatal() in this function.  This would create an infinite
+     loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
+  while (1)
+    grub_cpu_idle ();
 }
 
 void