diff --git a/ChangeLog b/ChangeLog
index dcbf025ab..f70fdfddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Robert Millan  <rmh@aybabtu.com>
+
+	* term/i386/pc/at_keyboard.c (grub_console_checkkey): Add support for
+	control key combinations.
+
 2008-05-29  Robert Millan  <rmh@aybabtu.com>
 
 	* util/powerpc/ieee1275/grub-install.in: Move from here ...
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index 51799e154..2417bf5f4 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -186,7 +186,9 @@ grub_console_checkkey (void)
 	key = -1;
 	break;
       default:
-	if ((at_keyboard_status & (KEYBOARD_STATUS_SHIFT_L | KEYBOARD_STATUS_SHIFT_R))
+	if (at_keyboard_status & (KEYBOARD_STATUS_CTRL_L | KEYBOARD_STATUS_CTRL_R))
+	  key = keyboard_map[key] - 'a' + 1;
+	else if ((at_keyboard_status & (KEYBOARD_STATUS_SHIFT_L | KEYBOARD_STATUS_SHIFT_R))
 	    && keyboard_map_shift[key])
 	  key = keyboard_map_shift[key];
 	else