diff --git a/ChangeLog b/ChangeLog
index 3618112..c19275d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-19  Robert Millan  <rmh@aybabtu.com>
+
+	* config.sub: Handle -kopensolaris*.
+	* testsuite/config-guess.data: Add test case.
+	* testsuite/config-sub.data: Likewise.
+
 2008-12-19  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (NCR*:*:4.2:*, MPRAS*:*:4.2:*): Add detection for
diff --git a/config.sub b/config.sub
index 9489dc7..cd833ea 100755
--- a/config.sub
+++ b/config.sub
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -1256,6 +1257,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 086771f..58ee046 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -38,3 +38,4 @@ IA64	6.0			Interix		ignored	ia64-unknown-interix6.0
 BePC	1.0			Haiku		ignored	i586-pc-haiku
 padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu
 ppc	2.6.9-22		Linux		ignored	powerpc-unknown-linux-gnu
+i686	5.11-686		GNU/kOpenSolaris	ignored	i686-unknown-kopensolaris5.11-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2151833..aef56cf 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -146,3 +146,4 @@ sh4aeb				sh4aeb-unknown-none
 sh4aeb-elf			sh4aeb-unknown-elf
 lm32-elf			lm32-unknown-elf
 lm32				lm32-unknown-none
+i686-kopensolaris5.11-gnu	i686-pc-kopensolaris5.11-gnu