diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 12e274d29..ad72bfb88 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-28  Eric Blake  <ebb9@byu.net>
+
+	* errno.cc (FILENAME_EXCED_RANGE): Map to ENAMETOOLONG.
+
 2005-03-27  Christopher Faylor  <cgf@timesys.com>
 
 	* signal.cc (nanosleep): Revert tv_sec < 0 check as it is fixed
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 62cf1dcba..c2ba157d8 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -78,7 +78,7 @@ static NO_COPY struct
   X (BUSY,			EBUSY),
   X (ALREADY_EXISTS,		EEXIST),
   X (NO_SIGNAL_SENT,		EIO),
-  X (FILENAME_EXCED_RANGE,	EINVAL),
+  X (FILENAME_EXCED_RANGE,	ENAMETOOLONG,
   X (META_EXPANSION_TOO_LONG,	EINVAL),
   X (INVALID_SIGNAL_NUMBER,	EINVAL),
   X (THREAD_1_INACTIVE,		EINVAL),