diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index cd7b70337..c21b2b6ff 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-08  Christopher Faylor  <cgf@redhat.com>
+
+	* environ.cc (parse_options): Remember the "no" part of any options for
+	later export.
+
 2002-08-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
 	* winsup.h (__check_null_invalid_struct): Make ptr argument non-const.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 04436edc1..a38fc46ad 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -559,6 +559,7 @@ parse_options (char *buf)
        p != NULL;
        p = strtok_r (NULL, " \t", &lasts))
     {
+      char *keyword_here = p;
       if (!(istrue = !strncasematch (p, "no", 2)))
 	p += 2;
       else if (!(istrue = *p != '-'))
@@ -602,7 +603,7 @@ parse_options (char *buf)
 	      *--eq = ch;
 
 	    int n = eq - p;
-	    p = strdup (p);
+	    p = strdup (keyword_here);
 	    if (n > 0)
 	      p[n] = ':';
 	    k->remember = p;