diff --git a/ChangeLog b/ChangeLog
index 5eeb9982c..7824adbc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-05  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub.in: Allow files in ${update_grub_dir} to contain
+	spaces.  Skip non-regular files.
+
 2007-11-05  Robert Millan  <rmh@aybabtu.com>
 
 	* kern/disk.c (grub_disk_firmware_fini)
diff --git a/util/update-grub.in b/util/update-grub.in
index 37a5e4ff6..f9f69b97f 100644
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -141,14 +141,14 @@ cat << EOF
 EOF
 
 for i in ${update_grub_dir}/* ; do
-  case $i in
+  case "$i" in
     # emacsen backup files. FIXME: support other editors
     *~) ;;
     *)
-      if test -x $i ; then
+      if test -f "$i" && test -x "$i" ; then
         echo
         echo "### BEGIN $i ###"
-        $i
+        "$i"
         echo "### END $i ###"
       fi
     ;;