diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index c714a1631..29a8dc09e 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/sys/linux/include/getopt.h: Add macros needed by
+	new version of getopt.c in libc/stdlib.
+
 2006-01-04  Gregory Pietsch  <gpietsch@comcast.net>
 
 	* libc/stdlib/getopt.c: Replaced with version
diff --git a/newlib/libc/sys/linux/include/getopt.h b/newlib/libc/sys/linux/include/getopt.h
index 994f86001..3fdf4645c 100644
--- a/newlib/libc/sys/linux/include/getopt.h
+++ b/newlib/libc/sys/linux/include/getopt.h
@@ -8,8 +8,11 @@
 
 #include <unistd.h>
 
-
-enum { no_argument, required_argument, optional_argument };
+enum { NO_ARG, REQUIRED_ARG, OPTIONAL_ARG };
+/* Define glibc names as well for compatibility.  */
+#define no_argument NO_ARG
+#define required_argument REQUIRED_ARG
+#define optional_argument OPTIONAL_ARG
 
 struct option {
     const char *name;