diff --git a/win32/dir.h b/win32/dir.h
index 28fbb6cf2e75fe..de12f79158d2b0 100644
--- a/win32/dir.h
+++ b/win32/dir.h
@@ -32,6 +32,7 @@ typedef struct {
 DIR*           rb_w32_opendir(const char*);
 DIR*           rb_w32_uopendir(const char*);
 struct direct* rb_w32_readdir(DIR *, rb_encoding *);
+struct direct* rb_w32_ureaddir(DIR *);
 long           rb_w32_telldir(DIR *);
 void           rb_w32_seekdir(DIR *, long);
 void           rb_w32_rewinddir(DIR *);
@@ -39,7 +40,7 @@ void           rb_w32_closedir(DIR *);
 char          *rb_w32_ugetcwd(char *, int);
 
 #define opendir(s)   rb_w32_uopendir((s))
-#define readdir(d)   rb_w32_readdir((d), 0)
+#define readdir(d)   rb_w32_ureaddir((d))
 #define telldir(d)   rb_w32_telldir((d))
 #define seekdir(d, l)   rb_w32_seekdir((d), (l))
 #define rewinddir(d) rb_w32_rewinddir((d))
diff --git a/win32/win32.c b/win32/win32.c
index 4f0c0d29c12b81..fcf18554408476 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2356,6 +2356,14 @@ rb_w32_readdir(DIR *dirp, rb_encoding *enc)
 	return readdir_internal(dirp, ruby_direct_conv, enc);
 }
 
+/* License: Ruby's */
+struct direct  *
+rb_w32_ureaddir(DIR *dirp)
+{
+    const UINT cp = CP_UTF8;
+    return readdir_internal(dirp, win32_direct_conv, &cp);
+}
+
 //
 // Telldir returns the current string pointer position
 //