diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index d0c42dec..14c81771 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-10  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnuserv.c (program_invocation_*_name): Declare this as `extern'
+	if necessary.
+	
 1998-12-17  Martin Baulig  <baulig@merkur.uni-trier.de>
 
 	* gnuserv.c: Don't include <gnome-argp.h>.
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 7406f7c8..ffef7180 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -50,6 +50,10 @@
 #include <sys/select.h>
 #endif
 
+#ifdef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
+extern char *program_invocation_name, *program_invocation_short_name;
+#endif
+
 #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 char *program_invocation_short_name;
 #endif