diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e63f70218..6e8d91c14 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Christopher Faylor  <cgf@timesys.com>
+
+	* environ.cc (win_env::add_cache): Don't add variables to the
+	environment during initialization.
+
 2005-12-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* exceptions.cc (_cygtls::handle_exceptions): Drop redundant `break'.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index af950dd05..6658fd5dc 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -116,7 +116,7 @@ win_env::add_cache (const char *in_posix, const char *in_native)
       towin32 (in_posix, native + namelen);
     }
   MALLOC_CHECK;
-  if (immediate)
+  if (immediate && cygwin_finished_initializing)
     {
       char s[namelen];
       size_t n = namelen - 1;