diff data/civ1/game.ruleset data/civ1/game.ruleset
--- data/civ1/game.ruleset	Fri Jun 30 13:18:42 2000
+++ data/civ1/game.ruleset	Fri Jun 30 13:37:39 2000
@@ -20,7 +20,6 @@
 min_city_center_trade  = 0
 
 ; Min distance between cities (move distance).
-; Currently limited to values 1 and 2.
 min_dist_bw_cities     = 1
 
 ; Square of initially visible radius (true distance).
diff data/civ2/game.ruleset data/civ2/game.ruleset
--- data/civ2/game.ruleset	Fri Jun 30 13:18:42 2000
+++ data/civ2/game.ruleset	Fri Jun 30 13:37:39 2000
@@ -20,7 +20,6 @@
 min_city_center_trade  = 0
 
 ; Min distance between cities (move distance).
-; Currently limited to values 1 and 2.
 min_dist_bw_cities     = 2
 
 ; Square of initially visible radius (true distance).
diff data/default/game.ruleset data/default/game.ruleset
--- data/default/game.ruleset	Fri Jun 30 13:18:42 2000
+++ data/default/game.ruleset	Fri Jun 30 13:37:39 2000
@@ -20,7 +20,6 @@
 min_city_center_trade  = 0
 
 ; Min distance between cities (move distance).
-; Currently limited to values 1 and 2.
 min_dist_bw_cities     = 2
 
 ; Square of initially visible radius (true distance).
diff server/ruleset.c server/ruleset.c
--- server/ruleset.c	Fri Jun 30 13:37:02 2000
+++ server/ruleset.c	Fri Jun 30 13:39:46 2000
@@ -1906,9 +1906,7 @@
   game.min_dist_bw_cities =
     secfile_lookup_int(&file, "civstyle.min_dist_bw_cities");
 
-  /* AI can't handle values greater than 2. */
-
-  if(game.min_dist_bw_cities<1 || game.min_dist_bw_cities>2) {
+  if(game.min_dist_bw_cities<1) {
     freelog(LOG_NORMAL, _("Bad value %i for min_dist_bw_cities. Using 2."),
             game.min_dist_bw_cities);
     game.min_dist_bw_cities = 2;
diff server/settlers.c server/settlers.c
--- server/settlers.c	Mon Jun 26 16:48:52 2000
+++ server/settlers.c	Fri Jun 30 13:37:39 2000
@@ -50,7 +50,7 @@
 static int is_already_assigned(struct unit *myunit, struct player *pplayer, 
 			       int x, int y);
 
-static int city_exists_within_city_radius(int x, int y);
+static int city_exists_too_close(int x, int y);
 
 /**************************************************************************
 ...
@@ -777,6 +777,8 @@
           return 0;
         if (dx<5 && dy<=5)
           return 0;
+	if (dx<game.min_dist_bw_cities && dy<game.min_dist_bw_cities)
+	  return 0;
       }
     }
     city_list_iterate_end;
@@ -1079,7 +1081,7 @@
 	    && (territory[x][y]&(1<<player_num))
 				/* pretty good, hope it's enough! -- Syela */
             && (near < 8 || map_get_continent(x, y) != ucont)
-	    && !city_exists_within_city_radius(x,y)) {
+	    && !city_exists_too_close(x,y)) {
 
 	  /* potential target, calculate mv_cost: */
           if (ferryboat) {
@@ -1476,18 +1478,32 @@
 }
 
 /**************************************************************************
-Return true iff a city exists within a city radius of the given location.
+Return true if a city exists within a city radius of the given location or
+closer than minimum distance between cities.
 (Not including a city at the given location.  I.e., if only city within
 radius is at (x,y), then returns false.)
 **************************************************************************/
-static int city_exists_within_city_radius(int x, int y)
+static int city_exists_too_close(int x, int y)
 {
   int dx, dy;
+  int a;
 
+  if(game.min_dist_bw_cities<=2) {
   city_radius_iterate(dx, dy) {
     if (!(dx==0 && dy==0)) {
       if (map_get_city(x+dx, y+dy))
 	return 1;
+      }
+    }
+  } else {
+    for (a = 0; a < game.nplayers; a++) {
+      city_list_iterate(game.players[a].cities, pcity) {
+	if(pcity->x!=x || pcity->y!=y) {
+	  if(real_map_distance(x,y,pcity->x,pcity->y)<game.min_dist_bw_cities)
+	    return 1;
+	}
+      }
+      city_list_iterate_end;
     }
   }