diff --git a/ChangeLog b/ChangeLog
index bdbe4414b..b132c80bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23  Robert Millan  <rmh@aybabtu.com>
+
+	* term/i386/pc/at_keyboard.c (grub_keyboard_isr): #ifdef out
+	grub_dprintf calls, since they make "debug=all" mode unusable.
+	(grub_console_checkkey): Likewise.
+
 2008-01-23  Robert Millan  <rmh@aybabtu.com>
 
 	* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Add
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index ad8fc3d2e..afb7a788b 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -147,7 +147,9 @@ grub_keyboard_isr (char key)
 	  /* Skip grub_dprintf.  */
 	  return;
       }
+#ifdef DEBUG_AT_KEYBOARD
   grub_dprintf ("atkeyb", "Control key 0x%0x was %s\n", key, is_make ? "pressed" : "unpressed");
+#endif
 }
 
 /* If there is a raw key pending, return it; otherwise return -1.  */
@@ -172,7 +174,9 @@ grub_console_checkkey (void)
   key = grub_keyboard_getkey ();
   if (key == -1)
     return -1;
+#ifdef DEBUG_AT_KEYBOARD
   grub_dprintf ("atkeyb", "Detected key 0x%x\n", key);
+#endif
   switch (key)
     {
       case CAPS_LOCK:
@@ -180,7 +184,9 @@ grub_console_checkkey (void)
 	  at_keyboard_status &= ~KEYBOARD_STATUS_CAPS_LOCK;
 	else
 	  at_keyboard_status |= KEYBOARD_STATUS_CAPS_LOCK;
+#ifdef DEBUG_AT_KEYBOARD
 	grub_dprintf ("atkeyb", "caps_lock = %d\n", !!(at_keyboard_status & KEYBOARD_STATUS_CAPS_LOCK));
+#endif
 	key = -1;
 	break;
       default: