diff --git a/ChangeLog b/ChangeLog
index e920219116..95970bf23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 20 03:12:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c: should not undef close on win32.
+	  it's defined to rb_w32_close, otherwise handle leaks.
+	  [ruby-Bugs-2131]
+
 Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* error.c (syserr_initialize): add 1 byte for snprintf() size for
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index b512839626..096a4e8894 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -193,11 +193,6 @@ ruby_getaddrinfo__aix(nodename, servname, hints, res)
 #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
 #endif
 
-#ifdef HAVE_CLOSESOCKET
-#undef close
-#define close closesocket
-#endif
-
 static VALUE
 init_sock(sock, fd)
     VALUE sock;