diff --git a/ChangeLog b/ChangeLog
index b33f575f90..ec4b409322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 12 16:50:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: a patch to build on GNU/kOpenSolaris from Rober
+	  Millan at [ruby-core:21888].
+
 Thu Feb 12 15:28:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* iseq.c (simple_default_value): allow plain strings as default
diff --git a/configure.in b/configure.in
index 958f76804e..5c5ce548c0 100644
--- a/configure.in
+++ b/configure.in
@@ -1398,7 +1398,7 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-when(linux* | gnu* | k*bsd*-gnu | bsdi*)
+when(linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
@@ -1491,7 +1491,7 @@ if test "$with_dln_a_out" != yes; then
 			when(*shlicc*)	: ${LDSHARED="$CC -r"}
 					rb_cv_dlopen=yes ;;
 			esac ;;
-	when(linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
+	when(linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu)
 			: ${LDSHARED='${CC} -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -1684,7 +1684,7 @@ else
 fi
 
 case "$target_os" in
-  when(linux* | gnu* | k*bsd*-gnu)
+  when(linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 	STRIP='strip -S -x';;
   when(nextstep* | openstep* | rhapsody* | darwin*)
 	STRIP='strip -A -n';;
@@ -1777,7 +1777,7 @@ if test "$enable_shared" = 'yes'; then
     when(sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    when(linux* | gnu* | k*bsd*-gnu | atheos*)
+    when(linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu)
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;