diff --git a/ChangeLog b/ChangeLog
index 933fc3f7b..3c144e593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-05  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* kern/ieee1275/openfw.c (grub_reboot): Disable for i386.  The
+	non-firmware-dependant one in realmode.S takes precedence.
+
 2009-12-04  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* commands/halt.c: Replace misc arch-specific headers with
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 20ef730e0..9a2b0c9aa 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -1,7 +1,7 @@
 /*  openfw.c -- Open firmware support functions.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2007,2008 Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2007,2008,2009 Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -399,11 +399,14 @@ grub_ieee1275_encode_devname (const char *path)
   return encoding;
 }
 
+/* On i386, a firmware-independant grub_reboot() is provided by realmode.S.  */
+#ifndef __i386__
 void
 grub_reboot (void)
 {
   grub_ieee1275_interpret ("reset-all", 0);
 }
+#endif
 
 void
 grub_halt (void)