diff --git a/ChangeLog b/ChangeLog
index 5e97413a8..e2bede971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-14  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/powerpc/ieee1275/init.c (grub_exit): Reimplement as a wrapper
+	for grub_ieee1275_exit(), in order to improve portability.
+
 2008-01-14  Robert Millan  <rmh@aybabtu.com>
 
 	* util/grub.d/10_linux.in (prefix): Define.
diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c
index aad17634f..c86ff79e3 100644
--- a/kern/powerpc/ieee1275/init.c
+++ b/kern/powerpc/ieee1275/init.c
@@ -55,10 +55,7 @@ grub_millisleep (grub_uint32_t ms)
 void
 grub_exit (void)
 {
-  /* Trap to Open Firmware.  */
-  asm ("trap");
-
-  for (;;);
+  grub_ieee1275_exit ();
 }
 
 /* Translate an OF filesystem path (separated by backslashes), into a GRUB