diff --git a/ChangeLog b/ChangeLog
index 9256549d6..88394b853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-20  Carles Pina i Estany  <carles@pina.cat>
+
+	* menu/normal.c (run_menu): Replace hardcoded numbers with macros
+	(16 for GRUB_TERM_UP and 14 for GRUB_TERM_DOWN)
+
 2008-08-19  Robert Millan  <rmh@aybabtu.com>
 
 	* term/gfxterm.c (DEFAULT_CURSOR_COLOR): Remove.
diff --git a/normal/menu.c b/normal/menu.c
index 279dd5877..d6fc0a33e 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -421,7 +421,7 @@ run_menu (grub_menu_t menu, int nested)
 		print_entries (menu, first, offset);
 	      break;
 
-	    case 16:
+	    case GRUB_TERM_UP:
 	    case '^':
 	      if (offset > 0)
 		{
@@ -438,7 +438,7 @@ run_menu (grub_menu_t menu, int nested)
 		}
 	      break;
 	      
-	    case 14:
+	    case GRUB_TERM_DOWN:
 	    case 'v':
 	      if (menu->size > first + offset + 1)
 		{