diff --git a/ChangeLog b/ChangeLog
index 8c6064cf8..7c45c3f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-01  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub.in: Export GRUB_CMDLINE_LINUX.
+
+	* util/grub.d/00_header.in: Only enable gfxterm when
+	convert_system_path_to_grub_path() succeeds.
+
 2007-05-20  Robert Millan  <rmh@aybabtu.com>
 
 	* util/update-grub_lib.in: New file.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index d4bc6d8ea..ea551d8fb 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -36,8 +36,7 @@ EOF
 # Prefer system path for space reasons (/boot/grub might be a very small
 # partition in case of OpenFirmware, etc).
 for i in /usr/share/grub/unifont.pff /boot/grub/unifont.pff ; do
-  if test -e $i ; then
-    grub_path=`convert_system_path_to_grub_path $i`
+  if test -e $i && grub_path=`convert_system_path_to_grub_path $i` ; then
     cat << EOF
 
 font ${grub_path}
diff --git a/util/update-grub.in b/util/update-grub.in
index 31e12b983..81d677d83 100644
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -94,7 +94,7 @@ fi
 export GRUB_DEVICE GRUB_FS GRUB_DRIVE GRUB_DRIVE_BOOT GRUB_DRIVE_BOOT_GRUB
 
 # These are optional, user-defined variables.
-export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR
+export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX
 
 exec > ${grub_cfg}.new
 chmod 444 ${grub_cfg}.new