diff -ru freeciv.orig/client/options.c freeciv/client/options.c
--- freeciv.orig/client/options.c	Sun Jun  4 10:39:52 2000
+++ freeciv/client/options.c	Sun Jun  4 10:40:11 2000
@@ -110,6 +110,7 @@
   N_("Worklist Events          "),          /* E_WORKLIST */
   N_("Pact Cancelled           "),          /* E_CANCEL_PACT */
   N_("Diplomatic Incident      "),          /* E_DIPL_INCIDENT */
+  N_("City Will Grow           "),          /* E_CITY_WILL_GROW */
 };
 
 /**************************************************************************
diff -ru freeciv.orig/common/events.h freeciv/common/events.h
--- freeciv.orig/common/events.h	Sun Jun  4 10:39:52 2000
+++ freeciv/common/events.h	Sun Jun  4 10:40:17 2000
@@ -53,6 +53,7 @@
   E_WORKLIST,
   E_CANCEL_PACT,
   E_DIPL_INCIDENT,
+  E_CITY_WILL_GROW,
   /* Note:  If you add a new event, make sure you make a similar change to
      message_text in client/options.c
      */
diff -ru freeciv.orig/server/cityturn.c freeciv/server/cityturn.c
--- freeciv.orig/server/cityturn.c	Sun Jun  4 10:39:52 2000
+++ freeciv/server/cityturn.c	Sun Jun  4 10:41:59 2000
@@ -1510,11 +1510,13 @@
   city_check_workers(pplayer, pcity);
   city_refresh(pcity);
 
+  /* moved outside of granary check, as it is used for will_grow warn now too */
+  turns_growth = (((pcity->size+1) * game.foodbox) - pcity->food_stock)
+                     / pcity->food_surplus;
+
   if (!city_got_effect(pcity,B_GRANARY) && !pcity->is_building_unit &&
     (pcity->currently_building == B_GRANARY) && (pcity->food_surplus > 0)
     && (pcity->shield_surplus > 0)) {
-    turns_growth = (((pcity->size+1) * game.foodbox) - pcity->food_stock)
-                     / pcity->food_surplus;
     turns_granary = (improvement_value(B_GRANARY) - pcity->shield_stock)
                      / pcity->shield_surplus;
     /* if growth and granary completion occur simultaneously, granary
@@ -1528,7 +1530,12 @@
 			improvement_types[B_GRANARY].name);
        }
     }
-  
+
+    if (turns_growth == 2)
+        notify_player_ex(city_owner(pcity), pcity->x, pcity->y, E_CITY_WILL_GROW,
+         		 _("Game: %s is going to grow to size of %i. "
+			   "Ensure that citizens are content."),
+			 pcity->name, pcity->size + 1);
 
 /* the AI often has widespread disorder when the Gardens or Oracle
 become obsolete.  This is a quick hack to prevent this.  980805 -- Syela */