diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 524ca3579..58d60a21b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-03  Eric Blake  <ebb9@byu.net>
+
+	* dir.cc (readdir_worker): Ensure that saw_dot flags are updated when
+	not handling inodes.
+
 2006-01-02  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_console.cc (beep): New function.  Restores missing "Default
@@ -6,7 +11,7 @@
 
 2006-01-02  Christopher Faylor  <cgf@timesys.com>
 
-	* dcrt0.cc (_dll_crt0): Move more leftover debugging stuff.
+	* dcrt0.cc (_dll_crt0): Remove more leftover debugging stuff.
 	(cygwin_dll_init): Remove unneeded initializations.  Call _dll_crt0
 	rather than dll_crt0_1.
 
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 7682233df..2e109083d 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -1,6 +1,6 @@
 /* dir.cc: Posix directory-related routines
 
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2006 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -105,10 +105,17 @@ readdir_worker (DIR *dir, dirent *de)
       {
 	de->__invalid_d_ino = 0;
 	de->__ino32 = 0;
+	if (de->d_name[0] == '.')
+	  {
+	    if (de->d_name[1] == '\0')
+	       dir->__flags |= dirent_saw_dot;
+	     else if (de->d_name[1] == '.' && de->d_name[2] == '\0')
+	       dir->__flags |= dirent_saw_dot_dot;
+	   }
       }
     else
       {
-	/* Compute __invalid_d_ino by combining filename hash with the directory hash
+	/* Compute d_ino by combining filename hash with the directory hash
 	   (which was stored in dir->__d_dirhash when opendir was called). */
 	if (de->d_name[0] == '.')
 	  {