diff --git a/ChangeLog b/ChangeLog
index 6fd2366b5..4148be186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-07  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/kern/corecmd.c (grub_core_cmd_set): Use grub_env_get
+	to fetch values when listing.
+
 2013-06-07  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	Fix make dist on non-pc.
diff --git a/grub-core/kern/corecmd.c b/grub-core/kern/corecmd.c
index bee216649..d9412a316 100644
--- a/grub-core/kern/corecmd.c
+++ b/grub-core/kern/corecmd.c
@@ -40,7 +40,7 @@ grub_core_cmd_set (struct grub_command *cmd __attribute__ ((unused)),
     {
       struct grub_env_var *env;
       FOR_SORTED_ENV (env)
-	grub_printf ("%s=%s\n", env->name, env->value);
+	grub_printf ("%s=%s\n", env->name, grub_env_get (env->name));
       return 0;
     }