diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index 0810274a3..6f885a73f 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: Quote the value assigned to `default',
+	in case it contains spaces.
+
 2009-12-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/30_os-prober.in: Fix merge error that moved a
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 577a12722..e8c3a14c4 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -40,7 +40,7 @@ if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
 load_env
-set default=${GRUB_DEFAULT}
+set default="${GRUB_DEFAULT}"
 if [ \${prev_saved_entry} ]; then
   saved_entry=\${prev_saved_entry}
   save_env saved_entry