diff --git a/ChangeLog b/ChangeLog
index e25639a42..820b595ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/efi/console.c (grub_console_checkkey): Macroify key contants.
+
 2010-04-09  EFI Coder <eficoder@hotmail.com>
 
 	* normal/menu_text.c (print_message): Clean up the message and show
diff --git a/term/efi/console.c b/term/efi/console.c
index c33cffdfe..664861398 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -159,27 +159,27 @@ grub_console_checkkey (void)
 	  read_key = key.unicode_char;
 	  break;
 	case 0x01:
-	  read_key = 16;
+	  read_key = GRUB_TERM_UP;
 	  break;
 	case 0x02:
-	  read_key = 14;
+	  read_key = GRUB_TERM_DOWN;
 	  break;
 	case 0x03:
-	  read_key = 6;
+	  read_key = GRUB_TERM_RIGHT;
 	  break;
 	case 0x04:
-	  read_key = 2;
+	  read_key = GRUB_TERM_LEFT;
 	  break;
 	case 0x05:
-	  read_key = 1;
+	  read_key = GRUB_TERM_HOME;
 	  break;
 	case 0x06:
-	  read_key = 5;
+	  read_key = GRUB_TERM_END;
 	  break;
 	case 0x07:
 	  break;
 	case 0x08:
-	  read_key = 4;
+	  read_key = GRUB_TERM_DC;
 	  break;
 	case 0x09:
 	  break;