diff --git a/ChangeLog b/ChangeLog
index b41dd6c48..95c6ad243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-13  Jun Inoue <jun.lambda@gmail.com>
+
+	* util/grub-mkconfig.in: Fix parsing of --output option.
+
 2009-06-12  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.in (pkgdata_SRCDIR): Remove.  genmodsrc.sh and
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index aad0683d8..6c18f6ac1 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -58,7 +58,7 @@ for option in "$@"; do
 	shift
 	grub_cfg=$1
 	;;
-    --output=)
+    --output=*)
 	grub_cfg=`echo "$option" | sed 's/--output=//'`
 	;;
     -*)