diff --git a/ChangeLog b/ChangeLog
index e472a921a..31bea9379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-17  Carles Pina i Estany  <carles@pina.cat>
+
+        * menu/normal.c (run_menu): Add Home and End keys in grub-menu.
+
 2008-08-17  Felix Zielcke  <fzielcke@z-51.de>
 
 	* gendistlist.sh: Add *.y, *.tex, *.texi, grub.cfg, README, *.sc,
diff --git a/normal/menu.c b/normal/menu.c
index 8a110d176..279dd5877 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -405,6 +405,22 @@ run_menu (grub_menu_t menu, int nested)
 	  
 	  switch (c)
 	    {
+	    case GRUB_TERM_HOME:
+	      first = 0;
+	      offset = 0;
+	      print_entries (menu, first, offset);
+	      break;
+
+	    case GRUB_TERM_END:
+	      offset = menu->size - 1;
+	      if (offset > GRUB_TERM_NUM_ENTRIES - 1)
+		{
+		  first = offset - (GRUB_TERM_NUM_ENTRIES - 1);
+		  offset = GRUB_TERM_NUM_ENTRIES - 1;
+		}
+		print_entries (menu, first, offset);
+	      break;
+
 	    case 16:
 	    case '^':
 	      if (offset > 0)