diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 6f1e1a9e8..ede71bb5f 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -31,38 +31,70 @@
 
 static grub_uint8_t usb_to_at_map[128] =
 {
-  /* 0x00 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x04 */ 0x1e /* a */, 0x30 /* b */, 0x2e /* c */, 0x20 /* d */, 
-  /* 0x08 */ 0x12 /* e */, 0x21 /* f */, 0x22 /* g */, 0x23 /* h */, 
-  /* 0x0c */ 0x17 /* i */, 0x24 /* j */, 0x25 /* k */, 0x26 /* l */, 
-  /* 0x10 */ 0x32 /* m */, 0x31 /* n */, 0x18 /* o */, 0x19 /* p */, 
-  /* 0x14 */ 0x10 /* q */, 0x13 /* r */, 0x1f /* s */, 0x14 /* t */, 
-  /* 0x18 */ 0x16 /* u */, 0x2f /* v */, 0x11 /* w */, 0x2d /* x */, 
-  /* 0x1c */ 0x15 /* y */, 0x2c /* z */, 0x02 /* 1 */, 0x03 /* 2 */, 
-  /* 0x20 */ 0x04 /* 3 */, 0x05 /* 4 */, 0x06 /* 5 */, 0x07 /* 6 */, 
-  /* 0x24 */ 0x08 /* 7 */, 0x09 /* 8 */, 0x0a /* 9 */, 0x0b /* 0 */, 
-  /* 0x28 */ 0x1c /* Enter */, 0x01 /* Escape */, 0x0e /* \b */, 0x0f /* \t */, 
-  /* 0x2c */ 0x39 /* Space */, 0x4a /* - */, 0x0d /* = */, 0x1a /* [ */, 
-  /* 0x30 */ 0x1b /* ] */, 0x2b /* \ */, 0x00, 0x27 /* ; */, 
-  /* 0x34 */ 0x28 /* " */, 0x29 /* ` */, 0x33 /* , */, 0x34 /* . */, 
-  /* 0x38 */ 0x35 /* / */, 0x00, 0x00, 0x00, 
-  /* 0x3c */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x40 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x44 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x48 */ 0x00, 0x00, 0x47 /* HOME */, 0x51 /* PPAGE */, 
-  /* 0x4c */ 0x53 /* DC */, 0x4f /* END */, 0x49 /* NPAGE */, 0x4d /* RIGHT */, 
-  /* 0x50 */ 0x4b /* LEFT */, 0x50 /* DOWN */, 0x48 /* UP */, 0x00, 
-  /* 0x54 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x58 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x5c */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x60 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x64 */ 0x56 /* 102nd key. */, 0x00, 0x00, 0x00, 
-  /* 0x68 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x6c */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x70 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x74 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x78 */ 0x00, 0x00, 0x00, 0x00, 
-  /* 0x7c */ 0x00, 0x00, 0x00, 0x00, 
+  /* 0x00 */ 0x00,                  0x00,
+  /* 0x02 */ 0x00,                  0x00, 
+  /* 0x04 */ 0x1e /* a */,          0x30 /* b */,
+  /* 0x06 */ 0x2e /* c */,          0x20 /* d */, 
+  /* 0x08 */ 0x12 /* e */,          0x21 /* f */,
+  /* 0x0a */ 0x22 /* g */,          0x23 /* h */, 
+  /* 0x0c */ 0x17 /* i */,          0x24 /* j */,
+  /* 0x0e */ 0x25 /* k */,          0x26 /* l */, 
+  /* 0x10 */ 0x32 /* m */,          0x31 /* n */, 
+  /* 0x12 */ 0x18 /* o */,          0x19 /* p */, 
+  /* 0x14 */ 0x10 /* q */,          0x13 /* r */,
+  /* 0x16 */ 0x1f /* s */,          0x14 /* t */, 
+  /* 0x18 */ 0x16 /* u */,          0x2f /* v */,
+  /* 0x1a */ 0x11 /* w */,          0x2d /* x */, 
+  /* 0x1c */ 0x15 /* y */,          0x2c /* z */,
+  /* 0x1e */ 0x02 /* 1 */,          0x03 /* 2 */, 
+  /* 0x20 */ 0x04 /* 3 */,          0x05 /* 4 */, 
+  /* 0x22 */ 0x06 /* 5 */,          0x07 /* 6 */, 
+  /* 0x24 */ 0x08 /* 7 */,          0x09 /* 8 */,
+  /* 0x26 */ 0x0a /* 9 */,          0x0b /* 0 */, 
+  /* 0x28 */ 0x1c /* Enter */,      0x01 /* Escape */,
+  /* 0x2a */ 0x0e /* \b */,         0x0f /* \t */, 
+  /* 0x2c */ 0x39 /* Space */,      0x0c /* - */,
+  /* 0x2e */ 0x0d /* = */,          0x1a /* [ */, 
+  /* 0x30 */ 0x1b /* ] */,          0x2b /* \ */, 
+  /* 0x32 */ 0x00,                  0x27 /* ; */, 
+  /* 0x34 */ 0x28 /* " */,          0x29 /* ` */,
+  /* 0x36 */ 0x33 /* , */,          0x34 /* . */, 
+  /* 0x38 */ 0x35 /* / */,          0x00,
+  /* 0x3a */ 0x3b /* F1 */,         0x3c /* F2 */, 
+  /* 0x3c */ 0x3d /* F3 */,         0x3e /* F4 */,
+  /* 0x3e */ 0x3f /* F5 */,         0x40 /* F6 */,
+  /* 0x40 */ 0x41 /* F7 */,         0x42 /* F8 */,
+  /* 0x42 */ 0x43 /* F9 */,         0x44 /* F10 */, 
+  /* 0x44 */ 0x57 /* F11 */,        0x58 /* F12 */,
+  /* 0x46 */ 0x00,                  0x00, 
+  /* 0x48 */ 0x00,                  0x00, 
+  /* 0x4a */ 0x47 /* HOME */,       0x51 /* PPAGE */, 
+  /* 0x4c */ 0x53 /* DC */,         0x4f /* END */, 
+  /* 0x4e */ 0x49 /* NPAGE */,      0x4d /* RIGHT */, 
+  /* 0x50 */ 0x4b /* LEFT */,       0x50 /* DOWN */, 
+  /* 0x52 */ 0x48 /* UP */,         0x00, 
+  /* 0x54 */ 0x00,                  0x00, 
+  /* 0x56 */ 0x00,                  0x00, 
+  /* 0x58 */ 0x00,                  0x00, 
+  /* 0x5a */ 0x00,                  0x00, 
+  /* 0x5c */ 0x00,                  0x00, 
+  /* 0x5e */ 0x00,                  0x00, 
+  /* 0x60 */ 0x00,                  0x00, 
+  /* 0x62 */ 0x00,                  0x00, 
+  /* 0x64 */ 0x56 /* 102nd key. */, 0x00, 
+  /* 0x66 */ 0x00,                  0x00, 
+  /* 0x68 */ 0x00,                  0x00, 
+  /* 0x6a */ 0x00,                  0x00, 
+  /* 0x6c */ 0x00,                  0x00, 
+  /* 0x6e */ 0x00,                  0x00, 
+  /* 0x70 */ 0x00,                  0x00,
+  /* 0x72 */ 0x00,                  0x00, 
+  /* 0x74 */ 0x00,                  0x00,
+  /* 0x76 */ 0x00,                  0x00, 
+  /* 0x78 */ 0x00,                  0x00,
+  /* 0x7a */ 0x00,                  0x00, 
+  /* 0x7c */ 0x00,                  0x00,
+  /* 0x7e */ 0x00,                  0x00, 
 };
 
 static grub_usb_device_t usbdev;
diff --git a/util/grub-mklayouts.c b/util/grub-mklayouts.c
index 6a51a9a76..dde2383e2 100644
--- a/util/grub-mklayouts.c
+++ b/util/grub-mklayouts.c
@@ -47,6 +47,10 @@ struct console_grub_equivalence
 };
 
 static struct console_grub_equivalence console_grub_equivalences[] = {
+  {"Escape", GRUB_TERM_ESC},
+  {"Tab", GRUB_TERM_TAB},
+  {"Delete", GRUB_TERM_BACKSPACE},
+
   {"KP_1", '1'},
   {"KP_2", '2'},
   {"KP_3", '3'},