diff --git a/ChangeLog b/ChangeLog
index 6d3b16d8..e99a4704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-03-19  Martin Baulig  <martin@home-of-linux.org>
+
+	This is *untested* - please read "sysdeps/freebsd/ChangeLog" !
+
+	* libgtop-sysdeps.m4: Use the `freebsd' sysdeps directory for
+	BSDI as well if the `--enable-hacker-mode' parameter was given.
+
 1999-03-18  Martin Baulig  <martin@home-of-linux.org>
 
 	* LIBGTOP-VERSION: Set version number to 1.0.2 binary age 1,
diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
index e6345f15..01e79ae1 100644
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -127,6 +127,12 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
+            bsdi*)
+	      libgtop_sysdeps_dir=freebsd
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	      ;;
 	    solaris*)
 	      libgtop_sysdeps_dir=solaris
 	      libgtop_use_machine_h=yes