diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b4c2eb67d..f5fab93bb 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-17  Corinna Vinschen  <vinschen@redhat.de>
+
+	* libc/sys/cygwin/include/unistd.h: Add __UNISTD_GETOPT_ to allow
+	conditionalized including of getopt stuff.
+
 2001-12-14  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* libc/stdio/Makefile.am (vfprintf.$(oext)): Add $(INCLUDES) to
diff --git a/newlib/libc/sys/cygwin/include/unistd.h b/newlib/libc/sys/cygwin/include/unistd.h
index a293861d5..9818176b9 100644
--- a/newlib/libc/sys/cygwin/include/unistd.h
+++ b/newlib/libc/sys/cygwin/include/unistd.h
@@ -4,6 +4,8 @@
 #define _UNISTD_H_
 
 # include <sys/unistd.h>
+# define __UNISTD_GETOPT__
 # include <getopt.h>
+# undef __UNISTD_GETOPT__
 
 #endif /* _UNISTD_H_ */