diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index eaef21a2..d0c42dec 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-17  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* gnuserv.c: Don't include <gnome-argp.h>.
+	(program_invocation_name, program_invocation_short_name): Define
+	this here.
+
 1998-12-09  Martin Baulig  <martin@home-of-linux.org>
 
 	Larger changes to the daemon:
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index cc6873f1..f924b090 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -41,7 +41,6 @@
 
 #include <glibtop/gnuserv.h>
 
-#include <gnome-argp.h>
 #include <popt-gnome.h>
 
 #include "daemon.h"
@@ -50,6 +49,14 @@
 #include <sys/select.h>
 #endif
 
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+char *program_invocation_short_name;
+#endif
+
+#ifndef HAVE_PROGRAM_INVOCATION_NAME
+char *program_invocation_name;
+#endif
+
 extern void handle_parent_connection __P ((int));
 extern void handle_slave_connection __P ((int, int));
 extern void handle_ipc_connection __P ((int));