diff --git a/ChangeLog b/ChangeLog
index 9ad8a169e5..6a30e4e01b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
+
+	* configure.in: The isinf is not regognized by autoconf
+	  library guesser on solaris 10. [ruby-core:7138]
+
 Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
diff --git a/configure.in b/configure.in
index 05af353b29..2de678d3a5 100644
--- a/configure.in
+++ b/configure.in
@@ -429,6 +429,9 @@ bow)		ac_cv_func_setitimer=no
 		;;
 superux*)     ac_cv_func_setitimer=no
               ;;
+solaris*2.10)  ac_cv_func_isinf=yes
+               LIBS="-lm $LIBS"
+              ;;
 *) LIBS="-lm $LIBS";;
 esac
 AC_CHECK_LIB(crypt, crypt)