diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 54c62f132..bafc5c7d2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,9 +1,14 @@
+2001-12-26  Christopher Faylor  <cgf@redhat.com>
+
+	* include/getopt.h: Protect a declaratin.
+
 2001-12-26  Robert Collins  <rbtcollins@hotmail.com>
 
-	* thread.cc (pthread_cond::Signal): Use a separate flag for signal detection
-	and broadcast semantics.
+	* thread.cc (pthread_cond::Signal): Use a separate flag for signal
+	detection and broadcast semantics.
 	(__pthread_cond_dowait): Ditto.
-	* thread.h (pthread_cond): New flag for testing when a waiter has woken.
+	* thread.h (pthread_cond): New flag for testing when a waiter has
+	woken.
 
 2001-12-26  Christopher Faylor  <cgf@redhat.com>
 
diff --git a/winsup/cygwin/include/getopt.h b/winsup/cygwin/include/getopt.h
index d3a3df9b8..7cbefbbb2 100644
--- a/winsup/cygwin/include/getopt.h
+++ b/winsup/cygwin/include/getopt.h
@@ -68,7 +68,9 @@ struct option {
 };
 
 int getopt_long (int, char *const *, const char *, const struct option *, int *);
-#define HAVE_DECL_GETOPT 1
+#ifndef HAVE_DECL_GETOPT
+#define HAVE_DECL_GETOPT 0
+#endif
 
 #define no_argument             0
 #define required_argument       1