diff -Nur -Xfreecivdiff.ignore freeciv-cvs/client/helpdata.c freeciv-patched/client/helpdata.c
--- freeciv-cvs/client/helpdata.c	2003-07-21 13:58:22.000000000 +0100
+++ freeciv-patched/client/helpdata.c	2003-07-24 17:04:01.000000000 +0100
@@ -504,40 +504,16 @@
   
   assert(buf&&user_text);
   buf[0] = '\0';
-  if(which==B_AQUEDUCT) {
-    sprintf(buf+strlen(buf), _("Allows a city to grow larger than size %d.  "),
-	    game.aqueduct_size);
-    if(improvement_exists(B_SEWER)) {
-      char *s = improvement_types[B_SEWER].name;
-      sprintf(buf+strlen(buf),
-	      _("(The %s improvement is also required for a city to grow"
-		" larger than size %d.)  "), s, game.sewer_size);
-    }
-    strcat(buf,"\n");
-  }
-  if(which==B_SEWER) {
-    sprintf(buf+strlen(buf), _("Allows a city to grow larger than size %d.  "),
-	   game.sewer_size);
-  }
   if (imp->helptext) {
     sprintf(buf+strlen(buf), "%s  ", _(imp->helptext));
   }
-  if(which==B_BARRACKS
-     && tech_exists(improvement_types[B_BARRACKS].obsolete_by)
-     && tech_exists(improvement_types[B_BARRACKS2].obsolete_by)) {
-    sprintf(buf+strlen(buf),
-	   _("\n\nNote that discovering %s or %s will obsolete"
-	   " any existing %s.  "),
-	   advances[improvement_types[B_BARRACKS].obsolete_by].name,
-	   advances[improvement_types[B_BARRACKS2].obsolete_by].name,
-	   improvement_types[B_BARRACKS].name);
-  }
-  if(which==B_BARRACKS2
-     && tech_exists(improvement_types[B_BARRACKS2].obsolete_by)) {
+  if (improvement_types[which].obsolete_by != A_NONE &&
+      tech_exists(improvement_types[which].obsolete_by)) {
     sprintf(buf+strlen(buf),
-	   _("\n\nThe discovery of %s will make %s obsolete.  "),
-	   advances[improvement_types[B_BARRACKS2].obsolete_by].name,
-	   improvement_types[B_BARRACKS2].name);
+            _("\n\nNote that discovering %s will obsolete"
+            " any existing %s.  "),
+            advances[improvement_types[which].obsolete_by].name,
+            improvement_types[which].name);
   }
   if (strcmp(user_text, "")!=0) {
     sprintf(buf+strlen(buf), "\n\n%s", user_text);
@@ -555,16 +531,6 @@
   
   assert(buf&&user_text);
   buf[0] = '\0';
-  if(which==B_MANHATTEN && num_role_units(F_NUCLEAR)>0) {
-    int u, t;
-    u = get_role_unit(F_NUCLEAR, 0);
-    assert(u<game.num_unit_types);
-    t = get_unit_type(u)->tech_requirement;
-    assert(t<game.num_tech_types);
-    sprintf(buf+strlen(buf),
-	   _("Allows all players with knowledge of %s to build %s units.  "),
-	   advances[t].name, get_unit_type(u)->name);
-  }
   if (imp->helptext) {
     sprintf(buf+strlen(buf), "%s  ", _(imp->helptext));
   }
diff -Nur -Xfreecivdiff.ignore freeciv-cvs/data/civ1/buildings.ruleset freeciv-patched/data/civ1/buildings.ruleset
--- freeciv-cvs/data/civ1/buildings.ruleset	2003-07-24 16:59:50.000000000 +0100
+++ freeciv-patched/data/civ1/buildings.ruleset	2003-07-24 17:04:01.000000000 +0100
@@ -81,12 +81,9 @@
     }
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
-; FIXME: use this help text when gen-impr implemented...
-; /* (ignore for gettext until fixed)
-; helptext	= _("\
-; Allows a city to grow larger than size 10.\
-; ")
-; */
+helptext	= _("\
+Allows a city to grow larger than size 10.\
+")
 
 [building_bank]
 name		= _("Bank")
@@ -1737,8 +1734,9 @@
     }
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
-;helptext is set in client/helpdata.c:helptext_wonder()
-;helptext	=
+helptext	= _("\
+Allows all players with knowledge of Rocketry to build Nuclear units.\
+")
 
 [building_marco_polos_embassy]
 name		= _("Marco Polo's Embassy")
diff -Nur -Xfreecivdiff.ignore freeciv-cvs/data/civ2/buildings.ruleset freeciv-patched/data/civ2/buildings.ruleset
--- freeciv-cvs/data/civ2/buildings.ruleset	2003-07-24 16:59:50.000000000 +0100
+++ freeciv-patched/data/civ2/buildings.ruleset	2003-07-24 17:04:01.000000000 +0100
@@ -81,13 +81,10 @@
     }
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
-; FIXME: use this help text when gen-impr implemented...
-; /* (ignore for gettext until fixed)
-; helptext	= _("\
-; Allows a city to grow larger than size 8.  A Sewer System is also\
-;  required for a city to grow larger than size 12.\
-; ")
-; */
+helptext	= _("\
+Allows a city to grow larger than size 8.  A Sewer System is also\
+ required for a city to grow larger than size 12.\
+")
 
 [building_bank]
 name		= _("Bank")
@@ -933,13 +930,10 @@
     }
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
-; FIXME: use this help text when gen-impr implemented...
-; /* (ignore for gettext until fixed)
-; helptext	= _("\
-; Allows a city to grow larger than size 12.  An Aqueduct is first\
-;  required for a city to grow larger than size 8.\
-; ")
-; */
+helptext	= _("\
+Allows a city to grow larger than size 12.  An Aqueduct is first\
+ required for a city to grow larger than size 8.\
+")
 
 [building_solar_plant]
 name		= _("Solar Plant")
@@ -1722,8 +1716,9 @@
     }
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
-;helptext is set in client/helpdata.c:helptext_wonder()
-;helptext	=
+helptext	= _("\
+Allows all players with knowledge of Rocketry to build Nuclear units.\
+")
 
 [building_marco_polos_embassy]
 name		= _("Marco Polo's Embassy")
diff -Nur -Xfreecivdiff.ignore freeciv-cvs/data/default/buildings.ruleset freeciv-patched/data/default/buildings.ruleset
--- freeciv-cvs/data/default/buildings.ruleset	2003-07-24 16:59:50.000000000 +0100
+++ freeciv-patched/data/default/buildings.ruleset	2003-07-24 17:04:01.000000000 +0100
@@ -128,13 +128,10 @@
     }
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
-; FIXME: use this help text when gen-impr implemented...
-; /* (ignore for gettext until fixed)
-; helptext	= _("\
-; Allows a city to grow larger than size 8.  A Sewer System is also\
-;  required for a city to grow larger than size 12.\
-; ")
-; */
+helptext	= _("\
+Allows a city to grow larger than size 8.  A Sewer System is also\
+ required for a city to grow larger than size 12.\
+")
 
 [building_bank]
 name		= _("Bank")
@@ -993,13 +990,10 @@
     }
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
-; FIXME: use this help text when gen-impr implemented...
-; /* (ignore for gettext until fixed)
-; helptext	= _("\
-; Allows a city to grow larger than size 12.  An Aqueduct is first\
-;  required for a city to grow larger than size 8.\
-; ")
-; */
+helptext	= _("\
+Allows a city to grow larger than size 12.  An Aqueduct is first\
+ required for a city to grow larger than size 8.\
+")
 
 [building_solar_plant]
 name		= _("Solar Plant")
@@ -1790,8 +1784,9 @@
     }
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
-;helptext is set in client/helpdata.c:helptext_wonder()
-;helptext	=
+helptext	= _("\
+Allows all players with knowledge of Rocketry to build Nuclear units.\
+")
 
 [building_marco_polos_embassy]
 name		= _("Marco Polo's Embassy")