diff --git a/ChangeLog b/ChangeLog
index 9fc7fdcf0..778d86145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/at_keyboard.c (set_scancodes)
+	[!GRUB_MACHINE_MIPS_YEELOONG && !GRUB_MACHINE_QEMU]: Use scancode set 1.
+
 2011-03-30  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Menu-specific commands): Remove some semantics
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index 55cb76483..7ce287ecc 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -330,6 +330,11 @@ set_scancodes (void)
       return;
     }
 
+#if !(defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_QEMU))
+  current_set = 1;
+  return;
+#endif
+
   grub_keyboard_controller_write (grub_keyboard_controller_orig
 				  & ~KEYBOARD_AT_TRANSLATE);