diff --git a/ChangeLog b/ChangeLog
index 88ca3576eb..c65b0cb3bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 14 17:08:15 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_close): need to reset osfhnd().
+
 Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
diff --git a/win32/win32.c b/win32/win32.c
index 5dafc0320f..7a7078335f 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3421,6 +3421,7 @@ rb_w32_close(int fd)
 	UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
 	return _close(fd);
     }
+    _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
     if (closesocket(sock) == SOCKET_ERROR) {
 	errno = map_errno(WSAGetLastError());
 	return -1;