diff --git a/ChangeLog b/ChangeLog
index 82701f516..3eb8b872e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-21 Andreas Born  <futur.andy@googlemail.com>
+
+	* kern/env.c (grub_env_context_open): Mark exported variable for
+	reexport.
+
 2009-12-21 Andreas Born  <futur.andy@googlemail.com>
 
 	* kern/env.c (grub_env_export): Create nonexistent variables before
diff --git a/kern/env.c b/kern/env.c
index f6fb5a492..73a2b927a 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -101,6 +101,7 @@ grub_env_context_open (int export)
 		  grub_env_context_close ();
 		  return grub_errno;
 		}
+	      grub_env_export (var->name);
 	      grub_register_variable_hook (var->name, var->read_hook, var->write_hook);
 	    }
 	}