diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index c675fd64..09880eea 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-19  Benoît Dejean  <tazforever@dlfp.org>
+
+	* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE
+	is defined.
+	Added missing initializers for popt options.
+
 2004-05-25  Benoît Dejean  <tazforever@dlfp.org>
 
 	* gnuserv.c: (permitted): Cast to size_t to remove warning.
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index ae126b04..27865879 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -274,7 +274,12 @@ permitted (u_long host_addr, int fd)
 static int
 setup_table (void)
 {
-    char hostname [HOSTNAMSZ], screen [BUFSIZ];
+    char hostname [HOSTNAMSZ];
+
+#ifdef AUTH_MAGIC_COOKIE
+    char screen [BUFSIZ];
+#endif
+
     long host_addr;
     int i, hosts = 0;
 
@@ -460,7 +465,7 @@ const struct poptOption popt_options [] = {
       N_("Don't fork into background"), N_("NO-DAEMON") },
     { "inetd", 'i', POPT_ARG_NONE, &invoked_from_inetd, 0,
       N_("Invoked from inetd"), N_("INETD") },
-    { NULL, '\0', 0, NULL, 0 }
+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
 };
 
 int