diff --git a/ChangeLog b/ChangeLog
index 07c262dc2..5568cbd3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Add some more quoting (of
+	"${prev_saved_entry}" and "${boot_once}") needed to make savedefault
+	work again.
+	Reported by: Mario 'BitKoenig' Holbe (Debian bug #584812).
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkpasswd-pbkdf2.c (main): Rename top-level `c' variable
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 199a1d7af..791840a60 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -61,7 +61,7 @@ set default="${GRUB_DEFAULT}"
 EOF
 fi
 cat <<EOF
-if [ \${prev_saved_entry} ]; then
+if [ "\${prev_saved_entry}" ]; then
   set saved_entry="\${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
@@ -70,7 +70,7 @@ if [ \${prev_saved_entry} ]; then
 fi
 
 function savedefault {
-  if [ -z \${boot_once} ]; then
+  if [ -z "\${boot_once}" ]; then
     saved_entry="\${chosen}"
     save_env saved_entry
   fi