diff --git a/ChangeLog b/ChangeLog
index 96990ba4..6e093f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added nsl to search-libs for getaddrinfo on opensolaris
+	* configure.ac
+
 2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed compile error on opensolaris
diff --git a/configure b/configure
index d0a39707..eaf68eeb 100755
--- a/configure
+++ b/configure
@@ -7514,7 +7514,7 @@ return getaddrinfo ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket; do
+for ac_lib in '' nsl socket; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
diff --git a/configure.ac b/configure.ac
index efce533f..8d37fb09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
 
 case "$target" in
 	*solaris*)
-                AC_SEARCH_LIBS([getaddrinfo], [socket])
+                AC_SEARCH_LIBS([getaddrinfo], [nsl socket])
 		;;
 esac