diff --git a/ChangeLog b/ChangeLog
index e02005b3f..bc59aa5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/loadenv.c (grub_cmd_save_env): Remove unset
+	variables.
+
 2013-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/gettext/gettext.c (grub_gettext_init_ext): Ignore errors
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 2a0b7ab24..de6da2616 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -432,6 +432,8 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)
               goto fail;
             }
         }
+      else
+	grub_envblk_delete (envblk, args[0]);
 
       argc--;
       args++;