diff --git a/ChangeLog b/ChangeLog
index d6ef26eb2e..622fc3c3bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 28 12:14:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't use local
+	  addresses which address family is different to remote address.
+
 Fri Jun 28 08:06:22 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (bigand_int): Add arguments, xn and hibitsx.
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index c3b989730d..01290cbb8f 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -42,7 +42,7 @@ static VALUE
 init_inetsock_internal(struct inetsock_arg *arg)
 {
     int type = arg->type;
-    struct addrinfo *res;
+    struct addrinfo *res, *lres;
     int fd, status = 0, local = 0;
     const char *syscall = 0;
 
@@ -62,6 +62,15 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	if (res->ai_family == AF_INET6)
 	    continue;
 #endif
+        lres = NULL;
+        if (arg->local.res) {
+            for (lres = arg->local.res; lres; lres = lres->ai_next) {
+                if (lres->ai_family == res->ai_family)
+                    break;
+            }
+            if (!lres)
+                continue;
+        }
 	status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
 	syscall = "socket(2)";
 	fd = status;
@@ -79,8 +88,8 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	    syscall = "bind(2)";
 	}
 	else {
-	    if (arg->local.res) {
-		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
+	    if (lres) {
+		status = bind(fd, lres->ai_addr, lres->ai_addrlen);
 		local = status;
 		syscall = "bind(2)";
 	    }
diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb
index 3cf1e3c36d..b594682904 100644
--- a/test/socket/test_tcp.rb
+++ b/test/socket/test_tcp.rb
@@ -7,19 +7,21 @@ end
 
 class TestSocket_TCPSocket < Test::Unit::TestCase
   def test_initialize_failure
-    s = TCPServer.new("localhost", nil)
+    addr = '127.0.0.1'
+
+    s = TCPServer.new(addr, nil)
     server_port = s.addr[1]
 
-    c = TCPSocket.new("localhost", server_port)
+    c = TCPSocket.new(addr, server_port)
     client_port = c.addr[1]
 
     begin
       # TCPServer.new uses SO_REUSEADDR so we must create a failure on the
       # local address.
-      TCPSocket.new("localhost", server_port, "localhost", client_port)
+      TCPSocket.new(addr, server_port, addr, client_port)
       flunk "expected SystemCallError"
     rescue SystemCallError => e
-      assert_match "for \"localhost\" port #{client_port}", e.message
+      assert_match "for \"#{addr}\" port #{client_port}", e.message
     end
   end