diff --git a/ChangeLog b/ChangeLog
index 122a50c74b..6a26901192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  2 00:39:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't try mismached
+	  address family if already failed.
+
 Mon Jul  1 23:07:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* template/encdb.h.tmpl: define encoding index macros to use the index
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index a146797dda..7b198bd154 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -69,7 +69,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
                     break;
             }
             if (!lres) {
-                if (res->ai_next)
+                if (res->ai_next || status < 0)
                     continue;
                 /* Use a different family local address if no choice, this
                  * will cause EAFNOSUPPORT. */