diff --git a/ChangeLog b/ChangeLog
index 739a3bfa85..a2b1ab2ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  7 14:51:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (errmap): add some winsock errors.
+
 Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
 
 	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
diff --git a/win32/win32.c b/win32/win32.c
index 3c7ac46ce5..2a117ab4f0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -171,7 +171,13 @@ static struct {
     {	ERROR_NESTING_NOT_ALLOWED,	EAGAIN		},
     {	ERROR_NOT_ENOUGH_QUOTA,		ENOMEM		},
     {	WSAENAMETOOLONG,		ENAMETOOLONG	},
-    {	WSAENOTEMPTY,			ENOTEMPTY	}
+    {	WSAENOTEMPTY,			ENOTEMPTY	},
+    {	WSAEINTR,			EINTR		},
+    {	WSAEBADF,			EBADF		},
+    {	WSAEACCES,			EACCES		},
+    {	WSAEFAULT,			EFAULT		},
+    {	WSAEINVAL,			EINVAL		},
+    {	WSAEMFILE,			EMFILE		},
 };
 
 static int