diff --git a/ChangeLog b/ChangeLog
index 6df83a9209..9041831e6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 21 09:24:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_opendir): should set errno if error occurs
+	  when calling OS API.
+
 Sun Jun 20 21:12:54 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (binary=): send TYPE commands only once.
diff --git a/win32/win32.c b/win32/win32.c
index 86596136e4..8059a1315d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1373,6 +1373,7 @@ rb_w32_opendir(const char *filename)
 
     fh = FindFirstFile(scanname, &fd);
     if (fh == INVALID_HANDLE_VALUE) {
+	errno = map_errno(GetLastError());
 	return NULL;
     }