diff --git a/ChangeLog b/ChangeLog
index b117724b..24cd826e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in: Some versions of Solaris require -lelf for -lkvm;
+	added appropriate check for this situation.
+
 1999-05-28  Martin Baulig  <baulig@Stud.Informatik.Uni-Trier.DE>
 
 	* include/glibtop/sysdeps.h: Remove the `GLIBTOP_SYSDEPS_FEATURES'
diff --git a/configure.in b/configure.in
index e3ca7ae4..7f7b6c62 100644
--- a/configure.in
+++ b/configure.in
@@ -187,13 +187,31 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
-AC_CHECK_LIB(kvm, kvm_open)
 
 dnl Solaris
 AC_CHECK_LIB(kstat, kstat_open)
 AC_CHECK_FUNCS(getloadavg swapctl)
 AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
 
+dnl Some versions of Solaris require -lelf for -lkvm
+AC_CHECK_LIB(kvm, kvm_open,[
+  LIBS="-lkvm $LIBS"
+],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
+   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
+   [ac_save_LIBS="$LIBS"
+    LIBS="-lkvm -lelf $LIBS"
+    AC_TRY_LINK([char kvm_open();], [kvm_open()],
+                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
+    LIBS="$ac_save_LIBS"
+   ])
+   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
+     AC_MSG_RESULT(yes)
+     LIBS="-lkvm -lelf $LIBS"
+   else
+     AC_MSG_RESULT(no)
+   fi
+])
+
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)