diff --git a/ChangeLog b/ChangeLog
index 63e692091..6dc676827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-09  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_cls): Use both the ANSI
+	escape sequence and a literal ^L to clear the screen.
+
+	* commands/ieee1275/suspend.c (grub_cmd_suspend): Clear the screen
+	when returning from Open Firmware.
+
 2005-11-09  Hollis Blanchard  <hollis@penguinppc.org>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_width): New variable.
diff --git a/commands/ieee1275/suspend.c b/commands/ieee1275/suspend.c
index 24f0b4446..ba7e4740e 100644
--- a/commands/ieee1275/suspend.c
+++ b/commands/ieee1275/suspend.c
@@ -21,6 +21,7 @@
 #include <grub/normal.h>
 #include <grub/dl.h>
 #include <grub/misc.h>
+#include <grub/term.h>
 #include <grub/ieee1275/ieee1275.h>
 
 static grub_err_t
@@ -30,6 +31,7 @@ grub_cmd_suspend (struct grub_arg_list *state  __attribute__ ((unused)),
 {
   grub_printf ("Run 'go' to resume GRUB.\n");
   grub_ieee1275_enter ();
+  grub_cls ();
   return 0;
 }
 
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 614ec95a8..ec4840678 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -285,8 +285,10 @@ grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
 static void
 grub_ofconsole_cls (void)
 {
-  /* Clear the screen.  */
-  grub_ofconsole_writeesc ("\e[2J");
+  /* Clear the screen.  Using serial console, screen(1) only recognizes the
+   * ANSI escape sequence.  Using video console, Apple Open Firmware (version
+   * 3.1.1) only recognizes the literal ^L.  So use both.  */
+  grub_ofconsole_writeesc ("\e[2J");
   grub_gotoxy (0, 0);
 }