diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 45c462ab1..d3a9b10e1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-25  Christopher Faylor  <cgf@timesys.com>
+
+	* errno.cc (errmap): Translate ERROR_NO_MORE_ITEMS to ENMFILE.
+
 2005-08-24  Christopher Faylor  <cgf@timesys.com>
 
 	* exceptions.cc (handle_sigsuspend): Just sleep forever if called from
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 8b84fb8ca..1d9220f21 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -102,6 +102,7 @@ static NO_COPY struct
   X (NO_DATA_DETECTED,		EIO),
   X (NO_MEDIA_IN_DRIVE,		ENOMEDIUM),
   X (NO_MORE_FILES,		ENMFILE),
+  X (NO_MORE_ITEMS,		ENMFILE),
   X (NO_MORE_SEARCH_HANDLES,	ENFILE),
   X (NO_PROC_SLOTS,		EAGAIN),
   X (NO_SIGNAL_SENT,		EIO),