diff --git a/ChangeLog b/ChangeLog
index ae2f7d1900..6647c4dbdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec  6 23:07:57 2004  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: check -lsocket for socketpair and shutdown.
+	  reported by Ville Mattila.  [ruby-core:03903]
+
 Mon Dec  6 23:00:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.
diff --git a/configure.in b/configure.in
index 95172d3f20..b0e81389fb 100644
--- a/configure.in
+++ b/configure.in
@@ -365,6 +365,7 @@ esac
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
 
 case "$target_cpu" in
 alpha*)		case "$target_os"::"$GCC" in