diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8da757506..f70628af6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,10 @@
-2003-11-11  Robert Collins <rbtcollins@hotmail.com>
+2003-11-15  Christopher Faylor  <cgf@redhat.com>
+
+	* include/limits.h: Revert unsanctioned changes below.
+	* include/cygwin/config.h: Ditto.
+	* include/sys/param.h: Ditto.
+
+2003-11-14  Robert Collins <rbtcollins@hotmail.com>
 	    Ron Parker <rdparker@butlermfg.com>
 
 	* bsdlib.cc: Update throughout to use CYG_MAX_PATH rather than MAX_PATH.
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
index 2613c444b..e3e09f051 100644
--- a/winsup/cygwin/include/cygwin/config.h
+++ b/winsup/cygwin/include/cygwin/config.h
@@ -20,7 +20,7 @@ extern "C" {
 #define _CYGWIN_CONFIG_H
 
 #define __DYNAMIC_REENT__
-#define __FILENAME_MAX__ (4096 - 1 /* NUL */)
+#define __FILENAME_MAX__ (260 - 1 /* NUL */)
 #define _READ_WRITE_RETURN_TYPE _ssize_t
 #define __LARGE64_FILES 1
 #define __CYGWIN_USE_BIG_TYPES__ 1
diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
index cefbbac64..9fa3cf4fe 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -125,7 +125,7 @@ details. */
 #define SSIZE_MAX (__LONG_MAX__)
 
 /* Maximum length of a path */
-#define PATH_MAX (4096 - 1 /*NUL*/)
+#define PATH_MAX (260 - 1 /*NUL*/)
 
 /* Max num groups for a user, value taken from NT documentation */
 /* Must match <sys/param.h> NGROUPS */
diff --git a/winsup/cygwin/include/sys/param.h b/winsup/cygwin/include/sys/param.h
index e067bbf95..811b5ee56 100644
--- a/winsup/cygwin/include/sys/param.h
+++ b/winsup/cygwin/include/sys/param.h
@@ -31,7 +31,7 @@
 
 /* This is defined to be the same as MAX_PATH which is used internally.
    The Posix version is PATH_MAX.  */
-#define MAXPATHLEN      (4096 - 1 /*NUL*/)
+#define MAXPATHLEN      (260 - 1 /*NUL*/)
 
 /* This is the number of bytes per block given in the st_blocks stat member.
    It should be in sync with S_BLKSIZE in sys/stat.h.  S_BLKSIZE is the