diff --git a/ChangeLog b/ChangeLog
index 143fc60f5..398495dea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/at_keyboard.c (set1_e0_mapping): Fix swap between
+	PgUp and PgDown.
+
 2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Bump version to 1.99.
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index 56aa7275e..f0f346b1b 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -111,12 +111,12 @@ static const struct
     {0x38, GRUB_KEYBOARD_KEY_RIGHT_ALT},
     {0x47, GRUB_KEYBOARD_KEY_HOME}, 
     {0x48, GRUB_KEYBOARD_KEY_UP},
-    {0x49, GRUB_KEYBOARD_KEY_NPAGE},
+    {0x49, GRUB_KEYBOARD_KEY_PPAGE}, 
     {0x4b, GRUB_KEYBOARD_KEY_LEFT},
     {0x4d, GRUB_KEYBOARD_KEY_RIGHT},
     {0x4f, GRUB_KEYBOARD_KEY_END}, 
     {0x50, GRUB_KEYBOARD_KEY_DOWN},
-    {0x51, GRUB_KEYBOARD_KEY_PPAGE}, 
+    {0x51, GRUB_KEYBOARD_KEY_NPAGE},
     {0x52, GRUB_KEYBOARD_KEY_INSERT},
     {0x53, GRUB_KEYBOARD_KEY_DELETE}, 
   };