diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 66d9e73e..7a8583f6 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -15,6 +15,7 @@
 
 #include "d_event.h"
 #include "d_ticcmd.h"
+#include "d_net.h"
 #include "d_netcmd.h"
 #include "tables.h"
 #include "d_player.h"
@@ -480,7 +481,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 eb657eec..30de2991 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