diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 90424c834..fbb2e4c4f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  9 14:30:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+	* dir.cc (readdir): Avoid reading from the beginning when
+	readdir is called after a previous call has returned NULL.
+
 Wed Nov  8 21:00:31 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* select.cc (peek_pipe): Deal with pending newline in pty_master.
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index d73eeac9f..d2b8bfec0 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -145,7 +145,8 @@ readdir (DIR * dir)
       return res;
     }
 
-  if (dir->__d_u.__d_data.__handle == INVALID_HANDLE_VALUE)
+  if (dir->__d_u.__d_data.__handle == INVALID_HANDLE_VALUE
+      && dir->__d_position == 0)
     {
       handle = FindFirstFileA (dir->__d_dirname, &buf);
       DWORD lasterr = GetLastError ();