diff --git a/ChangeLog b/ChangeLog
index 94e95fdef..e2d30dce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-15  Robert Millan  <rmh@aybabtu.com>
+
+	* term/i386/pc/console.c [GRUB_MACHINE_LINUXBIOS] (grub_console_init):
+	Initialize keyboard controller after registering the terminal, so that
+	grub_printf() can be called from grub_keyboard_controller_init().
+
 2008-06-15  Robert Millan  <rmh@aybabtu.com>
 
 	* fs/sfs.c (grub_sfs_read_extent): Fix the count of nodes in
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index 04a1ae1e4..1d199e927 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -149,12 +149,12 @@ static struct grub_term grub_console_term =
 void
 grub_console_init (void)
 {
+  grub_term_register (&grub_console_term);
+  grub_term_set_current (&grub_console_term);
+
 #ifdef GRUB_MACHINE_LINUXBIOS
   grub_keyboard_controller_init ();
 #endif
-
-  grub_term_register (&grub_console_term);
-  grub_term_set_current (&grub_console_term);
 }
 
 void