diff --git a/src/ChangeLog b/src/ChangeLog
index 6b9ec45c0..249638e14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-23  Roland Illig  <roland.illig@gmx.de>
+
+	* complete.c (environ): Don't declare environ on Cygwin.
+
+	From Pavel Tsekov <ptsekov gmx net>.
+
 2004-10-23  Roland Illig  <roland.illig@gmx.de>
 
 	* regex.c (regerror): Never use the __memcpy function, as it
diff --git a/src/complete.c b/src/complete.c
index 60042dda0..83e9a8d54 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -218,7 +218,7 @@ username_completion_function (char *text, int state)
 }
 
 /* Linux declares environ in <unistd.h>, so don't repeat it here. */
-#if (!(defined(__linux__) && defined (__USE_GNU)))
+#if (!(defined(__linux__) && defined (__USE_GNU)) && !defined(__CYGWIN__))
 extern char **environ;
 #endif