diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/common/game.h workdir/common/game.h
--- freeciv/common/game.h	Fri May 12 23:08:15 2000
+++ workdir/common/game.h	Fri May 12 23:33:37 2000
@@ -196,7 +196,7 @@
 #define GAME_MIN_MIN_PLAYERS         1
 #define GAME_MAX_MIN_PLAYERS         MAX_NUM_PLAYERS
 
-#define GAME_DEFAULT_MAX_PLAYERS     14
+#define GAME_DEFAULT_MAX_PLAYERS     MAX_NUM_PLAYERS
 #define GAME_MIN_MAX_PLAYERS         1
 #define GAME_MAX_MAX_PLAYERS         MAX_NUM_PLAYERS
 
diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/server/sernet.h workdir/server/sernet.h
--- freeciv/server/sernet.h	Fri May 12 23:08:23 2000
+++ workdir/server/sernet.h	Fri May 12 23:17:26 2000
@@ -15,7 +15,7 @@
 
 struct connection;
 
-#define MAX_NUM_CONNECTIONS 16
+#define MAX_NUM_CONNECTIONS (MAX_NUM_PLAYERS+MAX_NUM_BARBARIANS)
 #define DEFAULT_SOCK_PORT 5555
 #define BUF_SIZE 512