diff --git a/ChangeLog b/ChangeLog
index 7949e3352..9152de1e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/gensyminfo.sh.in: Handle the case of portable output
+	without --defined-only.
+
 2013-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/i386/relocator_common.S [__APPLE__ && __x86_64__]: Use
diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in
index af5ad9e71..2e8716b42 100644
--- a/grub-core/gensyminfo.sh.in
+++ b/grub-core/gensyminfo.sh.in
@@ -22,9 +22,12 @@ module=$1
 modname=`echo $module | sed -e 's@\.module.*$@@'`
 
 # Print all symbols defined by module
-if test x"@TARGET_NMFLAGS_DEFINED_ONLY@" = x; then
-    @TARGET_NM@ -g @TARGET_NMFLAGS_MINUS_P@ -p $module | \
+if test x"@TARGET_NMFLAGS_DEFINED_ONLY@" = x && test x"@TARGET_NMFLAGS_MINUS_P@" = x; then
+    @TARGET_NM@ -g -p $module | \
 	sed -n "s@^\([0-9a-fA-F]*\)  *[TBRDS]  *\([^ ]*\).*@defined $modname \2@p"
+elif test x"@TARGET_NMFLAGS_DEFINED_ONLY@" = x; then
+    @TARGET_NM@ -g @TARGET_NMFLAGS_MINUS_P@ -p $module | \
+	sed -n "s@^\([^ ]*\)  *[TBRDS]  *\([0-9a-fA-F]*\).*@defined $modname \1@p"
 else
     @TARGET_NM@ -g --defined-only @TARGET_NMFLAGS_MINUS_P@ -p $module | \
 	sed "s@^\([^ ]*\).*@defined $modname \1@g"