diff --git a/ChangeLog b/ChangeLog
index 9ba3d6d1..8db93835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-03-17  Martin Baulig  <martin@home-of-linux.org>
+
+	Imported first version of my Solaris port.
+
+	* configure.in: Check for `kstat_open' in `-lkstat'.
+
+	* libgtop-sysdeps.m4: Recognize the `solaris' sysdeps directory
+	when the `--enable-hacker-mode' parameter was given.
+
 1999-03-01  Martin Baulig  <martin@home-of-linux.org>
 
 	Released LibGTop 1.0.1.
diff --git a/configure.in b/configure.in
index e86160ab..554152e7 100644
--- a/configure.in
+++ b/configure.in
@@ -183,6 +183,9 @@ AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
 AC_CHECK_LIB(kvm, kvm_open)
 
+dnl Solaris 7
+AC_CHECK_LIB(kstat, kstat_open)
+
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 
@@ -401,6 +404,7 @@ sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
 sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
+sysdeps/solaris/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile
diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
index a055e53a..e6345f15 100644
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -127,9 +127,14 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
+	    solaris*)
+	      libgtop_sysdeps_dir=solaris
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=no
+	      ;;
 	    sunos4*)
 	      libgtop_sysdeps_dir=sun4
-	        libgtop_use_machine_h=yes
+	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    osf*)
diff --git a/sysdeps/Makefile.am b/sysdeps/Makefile.am
index 4fd61a4b..3eff545a 100644
--- a/sysdeps/Makefile.am
+++ b/sysdeps/Makefile.am
@@ -7,4 +7,4 @@ endif
 SUBDIRS			= @sysdeps_dir@ common names $(guile_SUBDIRS)
 
 DIST_SUBDIRS		= common guile linux kernel names osf1 \
-			  stub stub_suid sun4 freebsd
+			  stub stub_suid sun4 freebsd solaris