diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d4f274d84..c6ee41922 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-08  Christopher Faylor  <cgf@timesys.com>
+
+	* environ.cc (spenvs[]): windir -> WINDIR.
+
 2006-01-07  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_console.cc (fhandler_console::need_invisible): Remove
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 6658fd5dc..952dea544 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -889,7 +889,7 @@ static NO_COPY spenv spenvs[] =
   {NL ("USERDOMAIN="), false, false, &cygheap_user::env_domain},
   {NL ("USERNAME="), false, false, &cygheap_user::env_name},
   {NL ("USERPROFILE="), false, false, &cygheap_user::env_userprofile},
-  {NL ("windir="), true, true, &cygheap_user::env_systemroot}
+  {NL ("WINDIR="), true, true, &cygheap_user::env_systemroot}
 };
 
 char *