diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3252a1f21..68802ef6d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-30  Christopher Faylor  <cgf@timesys.com>
+
+	* environ.cc (spenvs): Re-force SYSTEMROOT to always be included in
+	environment.
+	(build_env): Ditto.
+
 2005-03-30  Christopher Faylor  <cgf@timesys.com>
 
 	* environ.cc (spenv::retrieve): Revert most of previous change.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 18bc4abf7..e7b17c31a 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -878,7 +878,7 @@ static NO_COPY spenv spenvs[] =
   {NL ("LOGONSERVER="), false, false, &cygheap_user::env_logsrv},
   {NL ("PATH="), false, true, NULL},
   {NL ("SYSTEMDRIVE="), false, false, NULL},
-  {NL ("SYSTEMROOT="), true, false, &cygheap_user::env_systemroot},
+  {NL ("SYSTEMROOT="), true, true, &cygheap_user::env_systemroot},
   {NL ("USERDOMAIN="), false, false, &cygheap_user::env_domain},
   {NL ("USERNAME="), false, false, &cygheap_user::env_name},
   {NL ("USERPROFILE="), false, false, &cygheap_user::env_userprofile}
@@ -984,8 +984,9 @@ build_env (const char * const *envp, char *&envblock, int &envc,
     if (!saw_spenv[i] && (spenvs[i].add_always || cygheap->user.issetuid ()))
       {
 	  *dstp = spenvs[i].retrieve (no_envblock);
-	  if (*dstp && !no_envblock && *dstp != env_dontadd)
+	  if (*dstp && (!no_envblock || spenvs[i].force) && *dstp != env_dontadd)
 	    {
+	      *pass_dstp = *dstp;
 	      tl += strlen (*dstp) + 1;
 	      dstp++;
 	    }