diff --git a/ChangeLog b/ChangeLog
index 42cf3dca3..3a988dcb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-12  Melki Christian  <Christian.melki@saabgroup.com>
+
+	* grub-core/term/at_keyboard.c [DEBUG_AT_KEYBOARD]: Fix compilation
+	error when enabling debug.
+
 2013-10-12  Ilya Bakulin <Ilya_Bakulin@genua.de>
 
 	* configure.ac: Use -melf_*_obsd on openbsd.
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index e255d4060..e773206e9 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -541,7 +541,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
   if (code == -1)
     return GRUB_TERM_NO_KEY;
 #ifdef DEBUG_AT_KEYBOARD
-  grub_dprintf ("atkeyb", "Detected key 0x%x\n", key);
+  grub_dprintf ("atkeyb", "Detected key 0x%x\n", code);
 #endif
   switch (code)
     {
@@ -551,7 +551,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
 	keyboard_controller_led (led_status);
 
 #ifdef DEBUG_AT_KEYBOARD
-	grub_dprintf ("atkeyb", "caps_lock = %d\n", !!(at_keyboard_status & KEYBOARD_STATUS_CAPS_LOCK));
+	grub_dprintf ("atkeyb", "caps_lock = %d\n", !!(at_keyboard_status & GRUB_KEYBOARD_STATUS_CAPS_LOCK));
 #endif
 	return GRUB_TERM_NO_KEY;
       case GRUB_KEYBOARD_KEY_NUM_LOCK:
@@ -560,7 +560,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
 	keyboard_controller_led (led_status);
 
 #ifdef DEBUG_AT_KEYBOARD
-	grub_dprintf ("atkeyb", "num_lock = %d\n", !!(at_keyboard_status & KEYBOARD_STATUS_NUM_LOCK));
+	grub_dprintf ("atkeyb", "num_lock = %d\n", !!(at_keyboard_status & GRUB_KEYBOARD_STATUS_NUM_LOCK));
 #endif
 	return GRUB_TERM_NO_KEY;
       case GRUB_KEYBOARD_KEY_SCROLL_LOCK: