diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ca3c6a083..e3d8786cb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-25  Christopher Faylor  <cgf@redhat.com>
+
+	* cygrun.c (main): Fix setting of CYGWIN environment variable.
+
+	* Makefile.in: Remove linking of unnecessary libraries.
+
 2002-09-24  Christopher January <chris@atomice.net>
 
 	* fhandler_proc.cc (format_process_stat): make ctty a real device
diff --git a/winsup/cygwin/cygrun.c b/winsup/cygwin/cygrun.c
index 94b0c399f..63d9863f7 100644
--- a/winsup/cygwin/cygrun.c
+++ b/winsup/cygwin/cygrun.c
@@ -36,10 +36,13 @@ main (int argc, char **argv)
     {
       char buf[4096];
       if (!p)
-	p[0] = '\0';
+	{
+	  p = buf;
+	  p[0] = '\0';
+	}
       else
 	{
-	  strcat (buf, p);
+	  strcpy (buf, p);
 	  strcat (buf, " ");
 	}
       strcat(buf, "ntsec");