diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 0e24f1685440a143c9a3af8578f70da59f37b97a..e9b180dfea29f07c4de95c39b0f46f0db7bba695 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -14,6 +14,7 @@
 #define __D_CLISRV__
 
 #include "d_ticcmd.h"
+#include "d_net.h"
 #include "d_netcmd.h"
 #include "tables.h"
 #include "d_player.h"
@@ -488,7 +489,7 @@ typedef struct
 #pragma pack()
 #endif
 
-#define MAXSERVERLIST 64 // Depends only on the display
+#define MAXSERVERLIST (MAXNETNODES-1)
 typedef struct
 {
 	SINT8 node;
diff --git a/src/d_net.h b/src/d_net.h
index eb657eec1d5ecf54872961494a53cfa7a9b5d146..30de2991657e8195f6a075fd65e32f4885c8d8f8 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -19,7 +19,7 @@
 #define __D_NET__
 
 // Max computers in a game
-#define MAXNETNODES (MAXPLAYERS+4)
+#define MAXNETNODES 64
 #define BROADCASTADDR MAXNETNODES
 #define NETSPLITSCREEN // Kart's splitscreen netgame feature