diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 062797744..76002fb22 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-09  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::readdir_helper): Set d_type
+	for virtual directories.
+
 2014-10-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_proc.cc (fhandler_proc::readdir): Set dirent d_type.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 2d1468bb4..ba615c26f 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -2046,7 +2046,8 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
 	  fname->Length = 0;
 	  return geterrno_from_win_error (w32_err);
 	}
-
+      if (de->d_ino == 2)	/* Inode number for virtual dirs. */
+	de->d_type = DT_DIR;
       attr = 0;
       dir->__flags &= ~dirent_set_d_ino;
     }