diff -Nurd -Xfreeciv-1.11.10/diff_ignore freeciv-1.11.10/common/game.h freeciv-1.11.10+mintimeout40/common/game.h
--- freeciv-1.11.10/common/game.h	Mon Jul  2 07:28:03 2001
+++ freeciv-1.11.10+mintimeout40/common/game.h	Thu Aug  9 12:29:10 2001
@@ -346,7 +346,7 @@
 #define GAME_MAX_AUTO_AI_TOGGLE      1
 
 #define GAME_DEFAULT_TIMEOUT         0
-#define GAME_MIN_TIMEOUT             0
+#define GAME_MIN_TIMEOUT             40
 #define GAME_MAX_TIMEOUT             8639999
 
 #define GAME_DEFAULT_TCPTIMEOUT      10
diff -Nurd -Xfreeciv-1.11.10/diff_ignore freeciv-1.11.10/server/stdinhand.c freeciv-1.11.10+mintimeout40/server/stdinhand.c
--- freeciv-1.11.10/server/stdinhand.c	Sat Jul 28 04:54:22 2001
+++ freeciv-1.11.10+mintimeout40/server/stdinhand.c	Thu Aug  9 12:36:37 2001
@@ -2537,7 +2537,10 @@
     if (!val && arg[0] != '0') {
       cmd_reply(CMD_SET, caller, C_SYNTAX,
 		_("Value must be an integer."));
-    } else if (val >= op->min_value && val <= op->max_value) {
+    } else if ((val >= op->min_value && val <= op->max_value)
+       || (val == 0 && !strcmp(op->name,"timeout"))) {
+       /* hack to allow 0 to be used as 'none' - 
+          a more general mechanism should be introduced for this - rp */
       char *reject_message = NULL;
       if (!settings[cmd].func_change || settings[cmd].func_change(val, &reject_message)) {
 	*(op->value) = val;