diff -Nru grub-1.99~rc2.orig//util/grub.d/00_header.in grub-1.99~rc2/util/grub.d/00_header.in
--- grub-1.99~rc2.orig//util/grub.d/00_header.in	2011-05-03 23:43:12.003250821 +0200
+++ grub-1.99~rc2/util/grub.d/00_header.in	2011-05-03 23:44:55.470345472 +0200
@@ -43,6 +43,7 @@
 if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
 
 cat << EOF
+saved_entry=0
 if [ -s \$prefix/grubenv ]; then
   load_env
 fi