diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/civ1/units.ruleset freeciv/data/civ1/units.ruleset
--- FreecivCVS/data/civ1/units.ruleset	Sat May  6 09:23:52 2000
+++ freeciv/data/civ1/units.ruleset	Sun Jun 25 10:18:34 2000
@@ -851,7 +851,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Trireme"
+flags         = "Trireme"
 roles         = "Ferryboat"
 
 [unit_sail]
@@ -920,7 +920,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = "Ferryboat"
 
 [unit_ironclad]
@@ -943,7 +943,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_destroyer]
@@ -966,7 +966,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_cruiser]
@@ -989,7 +989,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_aegis_cruiser]
@@ -1012,7 +1012,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "AEGIS"
+flags         = "AEGIS"
 roles         = ""
 
 [unit_battleship]
@@ -1035,7 +1035,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_submarine]
@@ -1058,7 +1058,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Partial_Invis", "No_Land_Attack"
+flags         = "Partial_Invis", "No_Land_Attack"
 roles         = ""
 helptext      = _("\
 Submarines have a very high strategic value, but have a weak\
@@ -1085,7 +1085,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Carrier"
+flags         = "Carrier"
 roles         = ""
 helptext      = _("\
 TIP:  Guard Carriers with a handful of fast-moving ships and a\
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/civ2/units.ruleset freeciv/data/civ2/units.ruleset
--- FreecivCVS/data/civ2/units.ruleset	Sat May  6 09:23:53 2000
+++ freeciv/data/civ2/units.ruleset	Sun Jun 25 09:48:04 2000
@@ -886,7 +886,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Trireme"
+flags         = "Trireme"
 roles         = "Ferryboat"
 
 [unit_caravel]
@@ -955,7 +955,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_ironclad]
@@ -978,7 +978,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_destroyer]
@@ -1001,7 +1001,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 helptext      = _("\
 TIP:  A very fast unit, which is very useful for hunting down enemy\
@@ -1028,7 +1028,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_aegis_cruiser]
@@ -1051,7 +1051,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "AEGIS"
+flags         = "AEGIS"
 roles         = ""
 
 [unit_battleship]
@@ -1074,7 +1074,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_submarine]
@@ -1097,7 +1097,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Partial_Invis", 
+flags         = "Partial_Invis", 
 	        "Missile_Carrier", "No_Land_Attack"
 roles         = ""
 helptext      = _("\
@@ -1125,7 +1125,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Carrier"
+flags         = "Carrier"
 roles         = ""
 helptext      = _("\
 TIP:  Guard Carriers with a handful of fast-moving ships and a\
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/default/units.ruleset freeciv/data/default/units.ruleset
--- FreecivCVS/data/default/units.ruleset	Sat May  6 09:23:53 2000
+++ freeciv/data/default/units.ruleset	Sun Jun 25 09:48:54 2000
@@ -886,7 +886,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Trireme"
+flags         = "Trireme"
 roles         = "Ferryboat"
 
 [unit_caravel]
@@ -955,7 +955,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_ironclad]
@@ -978,7 +978,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_destroyer]
@@ -1001,7 +1001,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 helptext      = _("\
 TIP:  A very fast unit, which is very useful for hunting down enemy\
@@ -1028,7 +1028,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_aegis_cruiser]
@@ -1051,7 +1051,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "AEGIS"
+flags         = "AEGIS"
 roles         = ""
 
 [unit_battleship]
@@ -1074,7 +1074,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit"
+flags         = ""
 roles         = ""
 
 [unit_submarine]
@@ -1097,7 +1097,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Partial_Invis", 
+flags         = "Partial_Invis", 
 	        "Missile_Carrier", "No_Land_Attack"
 roles         = ""
 helptext      = _("\
@@ -1125,7 +1125,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "FieldUnit", "Carrier"
+flags         = "Carrier"
 roles         = ""
 helptext      = _("\
 TIP:  Guard Carriers with a handful of fast-moving ships and a\