diff --git a/ChangeLog b/ChangeLog
index 65a3c69b8..779973f1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-05  Colin Watson  <cjwatson@debian.org>
+
+	* util/grub.d/00_header.in: Quote values assigned to `saved_entry',
+	in case they contain spaces.
+
 2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Prepend
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0a5cfac18..199a1d7af 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -62,7 +62,7 @@ EOF
 fi
 cat <<EOF
 if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
+  set saved_entry="\${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
   save_env prev_saved_entry
@@ -71,7 +71,7 @@ fi
 
 function savedefault {
   if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
+    saved_entry="\${chosen}"
     save_env saved_entry
   fi
 }