diff --git a/ChangeLog b/ChangeLog
index b78236750a..28490d60aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Jul 29 23:56:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 29 23:57:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inet_ntop): use rb_w32_inet_ntop, instead of
+	  inet_ntop directly, which is unavailable on older version Windows.
 
 	* win32/win32.c (rb_w32_inet_ntop): type should be const.
 
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 37315629f2..fe3cc6c02c 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -452,8 +452,8 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 #endif
     return numaddr;
 }
-#elif !defined HAVE_ARPA_INET_H
-extern char *inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len);
+#elif defined _WIN32
+# define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
 #endif
 
 /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295".  */