diff --git a/ChangeLog b/ChangeLog
index 678cf006f6..113c24b7e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 12 16:06:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
+	  check HAVE_TYPE_STRUCT_SOCKADDR_DL.
+
 Sat May 11 23:01:58 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index de89ddaf92..62150218e1 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -1159,7 +1159,7 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r
           }
 #endif
 
-#ifdef AF_LINK
+#if defined(AF_LINK) && defined(HAVE_TYPE_STRUCT_SOCKADDR_DL)
 	  /* AF_LINK is defined in 4.4BSD derivations since Net2.
 	     link_ntoa is also defined at Net2.
              However Debian GNU/kFreeBSD defines AF_LINK but