diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs /home/dzinsli/source/freeciv
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/ai/aicity.c /home/dzinsli/source/freeciv/ai/aicity.c
--- /home/dzinsli/source/freeciv-cvs/ai/aicity.c	Wed Jun 21 16:06:41 2000
+++ /home/dzinsli/source/freeciv/ai/aicity.c	Mon Jul  3 00:09:21 2000
@@ -235,20 +235,24 @@
 		   : get_improvement_name(bestchoice.choice)),
 		  bestchoice.want);
     if(!pcity->is_building_unit && is_wonder(pcity->currently_building) &&
-      (bestchoice.type || bestchoice.choice != pcity->currently_building))
-      notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STOPPED,
-                   _("Game: The %s have stopped building The %s in %s."),
-                   get_nation_name_plural(pplayer->nation),
-                   get_impr_name_ex(pcity, pcity->currently_building),
-                   pcity->name);
-
+       (bestchoice.type || bestchoice.choice != pcity->currently_building)) {
+      if (game.wonder_notify < 2) {
+	notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STOPPED,
+			 _("Game: The %s have stopped building The %s in %s."),
+			 get_nation_name_plural(pplayer->nation),
+			 get_impr_name_ex(pcity, pcity->currently_building),
+			 pcity->name);
+      }
+    }
     if (!bestchoice.type && (pcity->is_building_unit ||
                  pcity->currently_building != bestchoice.choice) &&
                  is_wonder(bestchoice.choice)) {
-      notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STARTED,
-                    _("Game: The %s have started building The %s in %s."),
-                    get_nation_name_plural(city_owner(pcity)->nation),
-                    get_impr_name_ex(pcity, bestchoice.choice), pcity->name);
+      if (game.wonder_notify < 2) {
+	notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STARTED,
+			 _("Game: The %s have started building The %s in %s."),
+			 get_nation_name_plural(city_owner(pcity)->nation),
+			 get_impr_name_ex(pcity, bestchoice.choice), pcity->name);
+      }
       pcity->currently_building = bestchoice.choice;
       pcity->is_building_unit    = (bestchoice.type > 0);
       generate_warmap(pcity, 0); /* need to establish distance to wondercity */
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/common/game.h /home/dzinsli/source/freeciv/common/game.h
--- /home/dzinsli/source/freeciv-cvs/common/game.h	Sun Jul  2 17:22:46 2000
+++ /home/dzinsli/source/freeciv/common/game.h	Mon Jul  3 00:09:21 2000
@@ -96,6 +96,7 @@
   int fogofwar;
   int fogofwar_old;	/* as the fog_of_war bit get changed by setting
 			   the server we need to remember the old setting */
+  int wonder_notify;
 
   int num_unit_types;
   int num_tech_types;  /* including A_NONE */
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/server/cityhand.c /home/dzinsli/source/freeciv/server/cityhand.c
--- /home/dzinsli/source/freeciv-cvs/server/cityhand.c	Wed Jun 21 16:07:06 2000
+++ /home/dzinsli/source/freeciv/server/cityhand.c	Mon Jul  3 00:09:20 2000
@@ -550,11 +550,13 @@
        because the worklist advances, then the wonder was completed -- 
        don't announce that the player has *stopped* building that wonder. 
        */
-    notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STOPPED,
-		     _("Game: The %s have stopped building The %s in %s."),
-		     get_nation_name_plural(pplayer->nation),
-		     get_impr_name_ex(pcity, pcity->currently_building),
-		     pcity->name);
+    if (game.wonder_notify == 1) {
+      notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STOPPED,
+		       _("Game: The %s have stopped building The %s in %s."),
+		       get_nation_name_plural(pplayer->nation),
+		       get_impr_name_ex(pcity, pcity->currently_building),
+		       pcity->name);
+    }
   }
 
 
@@ -604,11 +606,13 @@
   /* If the city is building a wonder, tell the rest of the world
      about it. */
   if (!pcity->is_building_unit && is_wonder(pcity->currently_building))
-    notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STARTED,
-		     _("Game: The %s have started building The %s in %s."),
-		     get_nation_name_plural(pplayer->nation),
-		     get_impr_name_ex(pcity, pcity->currently_building),
-		     pcity->name);
+    if (game.wonder_notify == 1) {
+      notify_player_ex(0, pcity->x, pcity->y, E_WONDER_STARTED,
+		       _("Game: The %s have started building The %s in %s."),
+		       get_nation_name_plural(pplayer->nation),
+		       get_impr_name_ex(pcity, pcity->currently_building),
+		       pcity->name);
+    }
 }
 
 /**************************************************************************
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/server/stdinhand.c /home/dzinsli/source/freeciv/server/stdinhand.c
--- /home/dzinsli/source/freeciv-cvs/server/stdinhand.c	Thu Jun 29 17:28:48 2000
+++ /home/dzinsli/source/freeciv/server/stdinhand.c	Mon Jul  3 00:23:37 2000
@@ -628,6 +628,17 @@
        "Levels: 0=no logging, 20=standard logging, 30=detailed logging, "
        "40=debuging logging.") },
 
+  {
+    "wondernotify", &game.wonder_notify,
+    SSET_META, SSET_TO_CLIENT,
+    0, 2, 0,
+    N_("Controls wonder building messages"), /* Could someone rephrase this for me? :) -manes */
+    N_("Controls notification to players when a wonder is started or stopped\n "
+       "If this is set to 0, clients will be notified when the computer starts or stops "
+       "building a wonder, but not if a human player does.\n "
+       "If this is set to 1, clients will always be notified\n"
+       "If this is set to 2, clients will not be notified at all.") },
+
   { NULL, NULL,
     SSET_LAST, SSET_SERVER_ONLY,
     0, 0, 0,