diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9497e2f62..5c818f603 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/limits.h (PATH_MAX): Add comment.
+	* include/cygwin/config.h (__FILENAME_MAX__): Define as 4096.  Add
+	comment.
+
 2008-06-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_tty.cc (fhandler_pty_master::setup): Fix pipe inheritance.
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
index 11f90ada2..f887bac15 100644
--- a/winsup/cygwin/include/cygwin/config.h
+++ b/winsup/cygwin/include/cygwin/config.h
@@ -43,7 +43,7 @@ extern char *_tlsbase __asm__ ("%fs:4");
 #define __getreent() (struct _reent *)(_tlsbase + tls_local_clib)
 #endif  /* _COMPILING_NEWLIB */
 
-#define __FILENAME_MAX__ (260 - 1 /* NUL */)
+#define __FILENAME_MAX__ 4096	/* Keep in sync with PATH_MAX in limits.h. */
 #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 20dd84a0b..fdda01298 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -324,6 +324,7 @@ details. */
 /* Maximum length of a path given to API functions including trailing NUL.
    Deliberately set to the same default value as on Linux.  Internal paths
    may be longer. */
+/* Keep in sync with __PATHNAME_MAX__ in cygwin/config.h */
 #undef PATH_MAX
 #define PATH_MAX 4096