diff --git a/ChangeLog b/ChangeLog
index 6b6a82a35..241b59b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/mips/startup.S (grub_prefix): Update comment to refer to
+	grub-mkimage rather than grub-mkelfimage.
+	* kern/powerpc/ieee1275/startup.S (grub_prefix): Likewise.
+
+2010-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
+	a key after CapsLock or NumLock. It's just a qemu bug.
+
 2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's
diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index c67bb9742..134853a9d 100644
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -148,7 +148,7 @@ compressed:
 
 VARIABLE(grub_prefix)
 
-	/* to be filled by grub-mkelfimage */
+	/* to be filled by grub-mkimage */
 
 	/*
 	 *  Leave some breathing room for the prefix.
diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
index 96d153778..526df1d91 100644
--- a/grub-core/kern/powerpc/ieee1275/startup.S
+++ b/grub-core/kern/powerpc/ieee1275/startup.S
@@ -33,7 +33,7 @@ _start:
 	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
-	/* to be filled by grub-mkelfimage */
+	/* to be filled by grub-mkimage */
 
 	/*
 	 *  Leave some breathing room for the prefix.
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index c3e71ea2d..25f32a0a5 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -181,9 +181,6 @@ grub_at_keyboard_getkey_noblock (void)
   switch (code)
     {
       case CAPS_LOCK:
-	/* Caps lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
 	led_status ^= KEYBOARD_LED_CAPS;
 	keyboard_controller_led (led_status);
@@ -194,9 +191,6 @@ grub_at_keyboard_getkey_noblock (void)
 	key = -1;
 	break;
       case NUM_LOCK:
-	/* Num lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
 	led_status ^= KEYBOARD_LED_NUM;
 	keyboard_controller_led (led_status);