diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index a8334f50..f0e1d919 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am: Link the `libgtop_daemon' and the `libgtop_server'
+	statically if possible.
+
 1999-05-07  Martin Baulig  <martin@home-of-linux.org>
 
 	* server.c (main): There's some problem with uname () - some systems
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 8fb7571a..50c7a7fb 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -41,11 +41,19 @@ libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
 				  $(GLIB_LIBS)\
 				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
 
+if ENABLE_STATIC
+libgtop_daemon_LDFLAGS		= -static
+endif
+
 libgtop_server_SOURCES		= server.c slave.c io.c version.c daemon.h
 libgtop_server_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la \
 				  @LIBSUPPORT@
 
+if ENABLE_STATIC
+libgtop_server_LDFLAGS		= -static
+endif
+
 EXTRA_DIST			= server_config.h.in server_config.pl
 
 install-exec-hook: