diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 256ae5d89..b2b143cb7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/sys/param.h (MAXPATHLEN): Define as PATH_MAX.
+
 2007-10-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.cc (is_at_eof): Rewrite using NT functions.
diff --git a/winsup/cygwin/include/sys/param.h b/winsup/cygwin/include/sys/param.h
index 349313f20..00a9b5ef8 100644
--- a/winsup/cygwin/include/sys/param.h
+++ b/winsup/cygwin/include/sys/param.h
@@ -1,6 +1,6 @@
 /* sys/param.h
 
-   Copyright 2001, 2003 Red Hat, Inc.
+   Copyright 2001, 2003, 2007 Red Hat, Inc.
 
    This software is a copyrighted work licensed under the terms of the
    Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
@@ -29,9 +29,8 @@
 /* FIXME: is this the appropriate value? */
 #define MAXHOSTNAMELEN	64
 
-/* This is defined to be the same as MAX_PATH which is used internally.
-   The Posix version is PATH_MAX.  */
-#define MAXPATHLEN      (260 - 1 /*NUL*/)
+/* The Posix version is PATH_MAX.  MAXPATHLEN is the BSD variant. */
+#define MAXPATHLEN      PATH_MAX
 
 /* 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