diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 30662e6..c200469 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -93,6 +93,11 @@ readdir_worker (DIR *dir, dirent *de)
     }
 
   de->d_ino = 0;
+#ifdef _DIRENT_HAVE_D_TYPE
+  de->d_type = DT_UNKNOWN;
+#endif
+  memset (&de->__d_unused1, 0, sizeof (de->__d_unused1));
+
   int res = ((fhandler_base *) dir->__fh)->readdir (dir, de);
 
   if (res == ENMFILE)
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index e0880f0..c748e24 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1677,6 +1677,28 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
       dir->__flags &= ~dirent_set_d_ino;
     }
 
+#ifdef _DIRENT_HAVE_D_TYPE
+  /* Set d_type if type can be determined from file attributes.
+     FILE_ATTRIBUTE_SYSTEM ommitted to leave DT_UNKNOWN for old symlinks.
+     For new symlinks, d_type will be reset to DT_UNKNOWN below.  */
+  if (attr &&
+      !(attr & ~( FILE_ATTRIBUTE_NORMAL
+                | FILE_ATTRIBUTE_READONLY
+                | FILE_ATTRIBUTE_ARCHIVE
+                | FILE_ATTRIBUTE_HIDDEN
+                | FILE_ATTRIBUTE_COMPRESSED
+                | FILE_ATTRIBUTE_ENCRYPTED
+                | FILE_ATTRIBUTE_SPARSE_FILE
+                | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
+                | FILE_ATTRIBUTE_DIRECTORY)))
+    {
+      if (attr & FILE_ATTRIBUTE_DIRECTORY)
+        de->d_type = DT_DIR;
+      else
+        de->d_type = DT_REG;
+    }
+#endif
+
   /* Check for directory reparse point.  These are potential volume mount
      points which have another inode than the underlying directory. */
   if ((attr & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT))
@@ -1728,7 +1750,12 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
 	    }
 	  path_conv fpath (&fbuf, PC_SYM_NOFOLLOW);
 	  if (fpath.issymlink () || fpath.is_fs_special ())
-	    fname->Length -= 4 * sizeof (WCHAR);
+            {
+	      fname->Length -= 4 * sizeof (WCHAR);
+#ifdef _DIRENT_HAVE_D_TYPE
+              de->d_type = DT_UNKNOWN;
+#endif
+            }
 	}
     }
 
diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h
index 41bfcc1..d782e58 100644
--- a/winsup/cygwin/include/sys/dirent.h
+++ b/winsup/cygwin/include/sys/dirent.h
@@ -18,11 +18,17 @@
 
 #pragma pack(push,4)
 #if defined(__INSIDE_CYGWIN__) || defined (__CYGWIN_USE_BIG_TYPES__)
+#define _DIRENT_HAVE_D_TYPE
 struct dirent
 {
   long __d_version;			/* Used internally */
   __ino64_t d_ino;
+#ifdef _DIRENT_HAVE_D_TYPE
+  unsigned char d_type;
+  unsigned char __d_unused1[3];
+#else
   __uint32_t __d_unused1;
+#endif
   __uint32_t __d_internal1;
   char d_name[NAME_MAX + 1];
 };
@@ -36,6 +42,8 @@ struct dirent
   char d_name[NAME_MAX + 1];
 };
 #endif
+/* Compile time size check.  */
+typedef char __ASSERT_SIZEOF_dirent[sizeof(struct dirent) == 20+NAME_MAX+1 ? 1 : -1];
 #pragma pack(pop)
 
 #define __DIRENT_COOKIE 0xdede4242
@@ -77,7 +85,7 @@ int scandir (const char *__dir,
 	     int (*compar) (const struct dirent **, const struct dirent **));
 
 int alphasort (const struct dirent **__a, const struct dirent **__b);
-#if 0  /* these make no sense in the absence of d_type */
+#ifdef _DIRENT_HAVE_D_TYPE
 /* File types for `d_type'.  */
 enum
 {
@@ -104,6 +112,6 @@ enum
 /* Convert between stat structure types and directory types.  */
 # define IFTODT(mode)		(((mode) & 0170000) >> 12)
 # define DTTOIF(dirtype)        ((dirtype) << 12)
-#endif /* #if 0 */
+#endif /* _DIRENT_HAVE_D_TYPE */
 #endif /* _POSIX_SOURCE */
 #endif /*_SYS_DIRENT_H*/