diff --git a/source/src/cube.h b/source/src/cube.h
index d3ddc1ee..e8a3e4a5 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -438,6 +438,7 @@ struct bounceent : physent // nades, gibs
 //enum { A_BLUE, A_GREEN, A_YELLOW };     // armour types... take 20/40/60 % off
 
 #define MAXCLIENTS 256                  // in a multiplayer game, can be arbitrarily changed
+#define DEFAULTCLIENTS 6
 #define MAXTRANS 5000                   // max amount of data to swallow in 1 go
 #define CUBE_SERVER_PORT 28763
 #define CUBE_SERVINFO_PORT 28764
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 8458cbd7..910d8d22 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -205,7 +205,7 @@ int framesinmap = 0;
 int main(int argc, char **argv)
 {    
     bool dedicated = false;
-    int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, par = 0, uprate = 0, maxcl = 4;
+    int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, par = 0, uprate = 0, maxcl = DEFAULTCLIENTS;
     char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = NULL, *masterpwd = NULL;
     islittleendian = *((char *)&islittleendian);
 
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 4d1d3731..43d49444 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -177,7 +177,7 @@ bool buildworldstate()
     };
 };
 
-int maxclients = 8;
+int maxclients = DEFAULTCLIENTS;
 string smapname;
 
 char *masterpasswd = NULL;