diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2473cf962..b1137280e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-14  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Fix length
+	check for ".." dir.
+
 2009-08-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Change comment
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 2c476e482..5e66ae96e 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1971,7 +1971,7 @@ go_ahead:
 	     come first. */
 	  if (FileNameLength == sizeof (WCHAR) && FileName[0] == '.')
 	    de->d_ino = get_ino_by_handle (pc, get_handle ());
-	  else if (FileNameLength == sizeof (WCHAR)
+	  else if (FileNameLength == 2 * sizeof (WCHAR)
 		   && FileName[0] == L'.' && FileName[1] == L'.')
 	    {
 	      if (!(dir->__flags & dirent_isroot))