diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d6ff33ca5..07f70fb19 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* environ.h: Fix comment.
+	* winsup.h: Ditto.  Reflect the fact that CYG_MAX_PATH is deprecated.
+
 2008-03-12  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pipe.cc (fhandler_pipe::create_selectable): Use MAX_PATH instead of
diff --git a/winsup/cygwin/environ.h b/winsup/cygwin/environ.h
index a50ef5bad..067072bfc 100644
--- a/winsup/cygwin/environ.h
+++ b/winsup/cygwin/environ.h
@@ -15,8 +15,7 @@ void environ_init (char **, int)
 /* The structure below is used to control conversion to/from posix-style
    file specs.  Currently, only PATH and HOME are converted, but PATH
    needs to use a "convert path list" function while HOME needs a simple
-   "convert to posix/win32".  For the simple case, where a calculated length
-   is required, just return CYG_MAX_PATH.  *FIXME* */
+   "convert to posix/win32".  */
 struct win_env
   {
     const char *name;
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 55db72960..7981e5469 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -64,16 +64,10 @@ extern unsigned long cygwin_inet_addr (const char *cp);
    PATH_MAX is from Posix and does include the trailing NUL.
    MAXPATHLEN is from Unix.
 
-   Thou shalt use CYG_MAX_PATH throughout.  It avoids the NUL vs no-NUL
-   issue and is neither of the Unixy ones [so we can punt on which
-   one is the right one to use].
-
-   Windows ANSI calls are limited to MAX_PATH in length. Cygwin calls that
-   thunk through to Windows Wide calls are limited to 32K. We define
-   CYG_MAX_PATH as a convenient, not to short, not too long 'happy medium'.
-
-   */
-
+   Thou shalt *not* use CYG_MAX_PATH anymore.  Use NT_MAX_PATH or
+   dynamic allocation instead when accessing real files.  Use
+   MAX_PATH in case you need a convenient small buffer when creating
+   names for synchronization objects or named pipes. */
 #define CYG_MAX_PATH (MAX_PATH)
 
 /* There's no define for the maximum path length the NT kernel can handle.