diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d169b102d..6bce22534 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-04  Christopher Faylor  <cgf@redhat.com>
+
+	* dir.cc (opendir): Don't attempt to call sub-opendir if ENOENT.
+
 2001-01-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc: Replace usage of AF_UNIX by Posix compliant AF_LOCAL
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 5713c5767..44db5d7be 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -88,6 +88,8 @@ opendir (const char *name)
 						PC_SYM_FOLLOW | PC_FULL, NULL);
   if (!fh)
     res = NULL;
+  else if (!pc.exists ())
+    set_errno (ENOENT);
   else
     {
       res = fh->opendir (pc);