diff --git a/ChangeLog b/ChangeLog
index f83304f551..8217e5874e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec  5 17:09:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inet_ntop): link aliased inet_ntop in
+	  libruby on mswin not rb_w32_inet_ntop which fails to link for
+	  unknown reason.
+
 Fri Dec  5 11:09:54 2014  Eric Wong  <e@80x24.org>
 
 	* iseq.c (prepare_iseq_build): remove unused block_opt param
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 2c4e77b673..98f0ddc3b0 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -658,8 +658,10 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 #endif
     return numaddr;
 }
-#elif defined _WIN32
+#elif defined __MINGW32__
 # define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
+#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90
+const char *WSAAPI inet_ntop(int, const void *, char *, size_t);
 #endif
 
 /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295".  */