diff --git a/ChangeLog b/ChangeLog
index f324b9216..0bad8bfe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-editenv.c (list_variables): Move print_var out of its
+	parent.
+
 2013-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 175ca8e1d..9b51acf7d 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -184,18 +184,18 @@ open_envblk_file (const char *name)
   return envblk;
 }
 
+static int
+print_var (const char *varname, const char *value)
+{
+  printf ("%s=%s\n", varname, value);
+  return 0;
+}
+
 static void
 list_variables (const char *name)
 {
   grub_envblk_t envblk;
 
-  auto int print_var (const char *varname, const char *value);
-  int print_var (const char *varname, const char *value)
-    {
-      printf ("%s=%s\n", varname, value);
-      return 0;
-    }
-
   envblk = open_envblk_file (name);
   grub_envblk_iterate (envblk, print_var);
   grub_envblk_close (envblk);