diff --git a/data/rules/classic/specification.xml b/data/rules/classic/specification.xml
index a33a27ca0..c0e05d35b 100644
--- a/data/rules/classic/specification.xml
+++ b/data/rules/classic/specification.xml
@@ -3042,6 +3042,47 @@
         <scope method-name="isIndian" method-value="true"/>
       </modifier>
     </european-nation-type>
+    <european-nation-type id="model.nationType.naval"
+                          extends="model.nationType.default">
+      <modifier id="model.modifier.movementBonus"
+                type="additive" value="3">
+        <scope ability-id="model.ability.navalUnit"/>
+      </modifier>
+      <unit id="ship" type="model.unit.merchantman"/>
+    </european-nation-type>
+    <european-nation-type id="model.nationType.building"
+                          extends="model.nationType.default">
+      <unit id="pioneer" type="model.unit.masterCarpenter"
+            role="model.role.pioneer"/>
+      <unit id="soldier" type="model.unit.expertLumberJack"
+            role="model.role.soldier"/>
+      <modifier id="model.goods.lumber" index="80"
+                type="additive" value="2"/>
+      <modifier id="model.goods.hammers" index="80"
+                type="additive" value="2">
+        <scope ability-id="model.ability.person" />
+      </modifier>
+    </european-nation-type>
+    <european-nation-type id="model.nationType.agriculture"
+                          extends="model.nationType.default">
+      <unit id="pioneer" type="model.unit.expertFarmer"
+            role="model.role.pioneer"/>
+      <modifier id="model.goods.grain" index="80"
+                type="additive" value="2"/>
+    </european-nation-type>
+    <european-nation-type id="model.nationType.furTrapping"
+                          extends="model.nationType.default">
+      <unit id="pioneer" type="model.unit.expertFurTrapper"
+            role="model.role.pioneer"/>
+      <unit id="soldier" type="model.unit.masterFurTrader"
+            role="model.role.soldier"/>
+      <modifier id="model.goods.furs" index="80"
+                type="additive" value="2"/>
+      <modifier id="model.goods.coats" index="80"
+                type="additive" value="2">
+        <scope ability-id="model.ability.person" />
+      </modifier>
+    </european-nation-type>
   </european-nation-types>
 
   <indian-nation-types>
@@ -3329,6 +3370,28 @@
             nation-type="model.nationType.ref"/>
     <nation id="model.nation.spanishREF" color="0xffdf00"
             nation-type="model.nationType.ref"/>
+            
+    <nation id="model.nation.portuguese" color="0x00ff00"
+            nation-type="model.nationType.naval" selectable="true"
+            preferred-latitude="-16" ref="model.nation.portugueseREF"/>
+    <nation id="model.nation.swedish" color="0x00bfff"
+            nation-type="model.nationType.building" selectable="true"
+            preferred-latitude="-39" ref="model.nation.swedishREF"/>
+    <nation id="model.nation.danish" color="0xff00bf"
+            nation-type="model.nationType.agriculture" selectable="true"
+            preferred-latitude="-64" ref="model.nation.danishREF"/>
+    <nation id="model.nation.russian" color="0xffffff"
+            nation-type="model.nationType.furTrapping" selectable="true"
+            preferred-latitude="-55" starts-on-east-coast="false"
+            ref="model.nation.russianREF"/>
+    <nation id="model.nation.portugueseREF" color="0xbfff00"
+            nation-type="model.nationType.ref"/>
+    <nation id="model.nation.swedishREF" color="0x367588"
+            nation-type="model.nationType.ref"/>
+    <nation id="model.nation.danishREF" color="0x91006d"
+            nation-type="model.nationType.ref"/>
+    <nation id="model.nation.russianREF" color="0xbebebe"
+            nation-type="model.nationType.ref"/>
   </nations>
 
   <options>
diff --git a/data/rules/freecol/specification.xml b/data/rules/freecol/specification.xml
index b2b88b48a..c45ca512d 100644
--- a/data/rules/freecol/specification.xml
+++ b/data/rules/freecol/specification.xml
@@ -83,74 +83,8 @@
       <modifier id="model.modifier.sailHighSeas"
                 type="additive" value="-1"/>
     </european-nation-type>
-
-    <european-nation-type id="model.nationType.naval"
-                          extends="model.nationType.default">
-      <modifier id="model.modifier.movementBonus"
-                type="additive" value="3">
-        <scope ability-id="model.ability.navalUnit"/>
-      </modifier>
-      <unit id="ship" type="model.unit.merchantman"/>
-    </european-nation-type>
-    <european-nation-type id="model.nationType.building"
-                          extends="model.nationType.default">
-      <unit id="pioneer" type="model.unit.masterCarpenter"
-            role="model.role.pioneer"/>
-      <unit id="soldier" type="model.unit.expertLumberJack"
-            role="model.role.soldier"/>
-      <modifier id="model.goods.lumber" index="80"
-                type="additive" value="2"/>
-      <modifier id="model.goods.hammers" index="80"
-                type="additive" value="2">
-        <scope ability-id="model.ability.person" />
-      </modifier>
-    </european-nation-type>
-    <european-nation-type id="model.nationType.agriculture"
-                          extends="model.nationType.default">
-      <unit id="pioneer" type="model.unit.expertFarmer"
-            role="model.role.pioneer"/>
-      <modifier id="model.goods.grain" index="80"
-                type="additive" value="2"/>
-    </european-nation-type>
-    <european-nation-type id="model.nationType.furTrapping"
-                          extends="model.nationType.default">
-      <unit id="pioneer" type="model.unit.expertFurTrapper"
-            role="model.role.pioneer"/>
-      <unit id="soldier" type="model.unit.masterFurTrader"
-            role="model.role.soldier"/>
-      <modifier id="model.goods.furs" index="80"
-                type="additive" value="2"/>
-      <modifier id="model.goods.coats" index="80"
-                type="additive" value="2">
-        <scope ability-id="model.ability.person" />
-      </modifier>
-    </european-nation-type>
   </european-nation-types>
 
-  <nations>
-    <nation id="model.nation.portuguese" color="0x00ff00"
-            nation-type="model.nationType.naval" selectable="true"
-            preferred-latitude="-16" ref="model.nation.portugueseREF"/>
-    <nation id="model.nation.swedish" color="0x00bfff"
-            nation-type="model.nationType.building" selectable="true"
-            preferred-latitude="-39" ref="model.nation.swedishREF"/>
-    <nation id="model.nation.danish" color="0xff00bf"
-            nation-type="model.nationType.agriculture" selectable="true"
-            preferred-latitude="-64" ref="model.nation.danishREF"/>
-    <nation id="model.nation.russian" color="0xffffff"
-            nation-type="model.nationType.furTrapping" selectable="true"
-            preferred-latitude="-55" starts-on-east-coast="false"
-            ref="model.nation.russianREF"/>
-    <nation id="model.nation.portugueseREF" color="0xbfff00"
-            nation-type="model.nationType.ref"/>
-    <nation id="model.nation.swedishREF" color="0x367588"
-            nation-type="model.nationType.ref"/>
-    <nation id="model.nation.danishREF" color="0x91006d"
-            nation-type="model.nationType.ref"/>
-    <nation id="model.nation.russianREF" color="0xbebebe"
-            nation-type="model.nationType.ref"/>
-  </nations>
-
   <options>
     <optionGroup id="difficultyLevels" recursive="false">
       <optionGroup id="model.difficulty.veryEasy" editable="false">