diff --git a/ChangeLog b/ChangeLog
index e2ad6f4d..d9031aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Don't use kvm on newer solaris.
+	Patch by hua.zhang@sun.com.
+	Closes #345811.
+
 2006-06-04  Benoît Dejean  <benoit@placenet.org>
 
 	* libgtop-sysdeps.m4:
diff --git a/configure.in b/configure.in
index c6a440fb..e5d246f4 100644
--- a/configure.in
+++ b/configure.in
@@ -174,6 +174,8 @@ case "$host_os" in
 
 
     dnl Some versions of Solaris require -lelf for -lkvm
+    case $host_os in
+    solaris[[8-9]] | solaris2.[[0-9]].*)
     AC_CHECK_LIB(kvm, kvm_open,[
       LIBS="-lkvm $LIBS"
     ],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
@@ -192,6 +194,8 @@ case "$host_os" in
        fi
     ])
      ;;
+     esac
+     ;;
 esac
 
 dnl For DEC OSF1