diff --git a/ChangeLog.savedefault b/ChangeLog.savedefault
index f07bd6beb..90875588e 100644
--- a/ChangeLog.savedefault
+++ b/ChangeLog.savedefault
@@ -1,3 +1,10 @@
+2010-10-05  Jordan Uggla  <jordan.uggla@gmail.com>
+2010-10-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Define a "savedefault" function for use
+	in menu entries.
+	* util/grub-mkconfig_lib.in (save_default_entry): Use it.
+
 2010-10-05  Jordan Uggla  <jordan.uggla@gmail.com>
 2010-10-05  Colin Watson  <cjwatson@ubuntu.com>
 
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 72e0e38f9..380ba1a48 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -94,10 +94,7 @@ save_default_entry ()
 {
   if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
     cat << EOF
-if [ -z \${boot_once} ]; then
-  set saved_entry=\${chosen}
-  save_env saved_entry
-fi
+savedefault
 EOF
   fi
 }
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 85ce0d4a0..cfb8648ca 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -50,6 +50,13 @@ if [ \${prev_saved_entry} ]; then
   save_env prev_saved_entry
   set boot_once=true
 fi
+
+function savedefault {
+  if [ -z \${boot_once} ]; then
+    saved_entry=\${chosen}
+    save_env saved_entry
+  fi
+}
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in