diff --git a/ChangeLog b/ChangeLog
index 3d01089f..548a5b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-11-11  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/gnuserv.h (MCOOKIE_SCREEN): Don't define this
+	any longer, we now use the port the daemon is listening on instead
+	of a fixed screen.
+
 1998-11-11  Martin Baulig  <martin@home-of-linux.org>
 
 	* configure.in (--enable-debug): Define LIBGTOP_ENABLE_DEBUG
diff --git a/include/glibtop/gnuserv.h b/include/glibtop/gnuserv.h
index 96099259..8eb36128 100644
--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -75,7 +75,9 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  * stuff related to supporting MIT-MAGIC-COOKIE-1
  */
 
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
+#if 0
+#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */ 
+#endif
 #define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
 #define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
 
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 8a70f2ac..05563b97 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -216,7 +216,7 @@ permitted (u_long host_addr, int fd)
 static int
 setup_table (void)
 {
-	char hostname [HOSTNAMSZ];
+	char hostname [HOSTNAMSZ], screen [BUFSIZ];
 	long host_addr;
 	int i, hosts = 0;
 
@@ -231,10 +231,12 @@ setup_table (void)
 
 #ifdef AUTH_MAGIC_COOKIE
 
+	sprintf (screen, "%d", SERVER_PORT);
+
 	server_xauth = XauGetAuthByAddr
 		(FamilyInternet,
 		 sizeof (host_addr), (char *) &host_addr,
-		 strlen (MCOOKIE_SCREEN), MCOOKIE_SCREEN,
+		 strlen (screen), screen,
 		 strlen (MCOOKIE_X_NAME), MCOOKIE_X_NAME);
 	hosts++;
 
diff --git a/sysdeps/common/gnuslib.c b/sysdeps/common/gnuslib.c
index ca2c5fbe..15a7078e 100644
--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -274,11 +274,13 @@ connect_to_internet_server (const char *serverhost, u_short port)
 
 	/* send credentials using MIT-MAGIC-COOKIE-1 protocol */
 
+	sprintf (buf, "%d", port);
+
 	server_xauth =
 		XauGetAuthByAddr (FamilyInternet,
 				  sizeof (peeraddr_in.sin_addr.s_addr),
 				  (char *) &peeraddr_in.sin_addr.s_addr,
-				  strlen (MCOOKIE_SCREEN), MCOOKIE_SCREEN,
+				  strlen (buf), buf,
 				  strlen (MCOOKIE_X_NAME), MCOOKIE_X_NAME);
 
 	if (server_xauth && server_xauth->data) {