diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index 6f885a73f..cdeb05a87 100644
--- a/ChangeLog.savedefault
+++ b/ChangeLog.savedefault
@@ -1,3 +1,8 @@
+2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Silently ignore zero-sized environment
+	blocks.
+
 2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/00_header.in: Quote the value assigned to `default',
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index e8c3a14c4..2bcfe1d25 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -39,7 +39,9 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
-load_env
+if [ -s \$prefix/grubenv ]; then
+  load_env
+fi
 set default="${GRUB_DEFAULT}"
 if [ \${prev_saved_entry} ]; then
   saved_entry=\${prev_saved_entry}