diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 328ae0ada..7328dbc94 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-24  Christopher Faylor  <cgf@redhat.com>
+
+	* cygcheck.cc (dump_sysinfo): Ensure that CYGWIN environment variable
+	is correctly set.
+
 2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* getfacl.c (username): Fix ambiguous printf calls.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 96bf35024..090d077a1 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -950,7 +950,11 @@ dump_sysinfo ()
 
   fflush (stdout);
 
-  char *cygwin = getenv ("CYGWIN") ?: const_cast <char *> ("CYGWIN=");
+  char *cygwin = getenv ("CYGWIN");
+  if (cygwin)
+    cygwin -= strlen ("CYGWIN=");
+  else
+    cygwin = const_cast <char *> ("CYGWIN=");
   size_t cyglen = strlen (cygwin);
   cygwin = strcpy ((char *) malloc (cyglen + sizeof (" nontsec")), cygwin);
   pretty_id ("nontsec", cygwin, cyglen);