diff --git a/ChangeLog b/ChangeLog
index 7f1ddea43..7e932d412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkconfig_lib.in (print_option_help): Properly redirect
+	stderr on test calls.
+
 2012-05-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/jfs.c (grub_jfs_find_file): Handle "." and "..".
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index d0b7a7073..606cb04aa 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -290,16 +290,16 @@ uses_abstraction () {
 
 print_option_help () {
   if test x$print_option_help_wc = x; then
-      if wc -L < /dev/null > /dev/null; then
+      if wc -L  </dev/null > /dev/null 2>&1; then
 	  print_option_help_wc=-L
-      elif wc -m < /dev/null > /dev/null; then
+      elif wc -m  </dev/null > /dev/null 2>&1; then
 	  print_option_help_wc=-m
       else
 	  print_option_help_wc=-b
       fi
   fi
   if test x$grub_have_fmt = x; then
-      if fmt -w 40 < /dev/null > /dev/null; then
+      if fmt -w 40  </dev/null > /dev/null 2>&1; then
 	  grub_have_fmt=y;
       else
 	  grub_have_fmt=n;