diff --git a/src/res/buildings/castle-2.xml b/src/res/buildings/castle-2.xml
new file mode 100644
index 000000000..caceb3c08
--- /dev/null
+++ b/src/res/buildings/castle-2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<building name="castle" capacity="1" protection="yes" taxes="yes">
+  <function name="name" value="castle_name_2"/>
+  <function name="protection" value="lua_building_protection"/>
+  <function name="taxes" value="lua_building_taxes"/>
+  <construction skill="building" minskill="1" maxsize="9" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="2" maxsize="49" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="3" maxsize="249" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="4" maxsize="1249" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="5" maxsize="6249" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="6" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+</building>
diff --git a/src/res/buildings/castle.xml b/src/res/buildings/castle.xml
index e69de29bb..211381a71 100644
--- a/src/res/buildings/castle.xml
+++ b/src/res/buildings/castle.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<building name="castle" capacity="1" protection="yes" taxes="yes">
+  <function name="name" value="castle_name"/>
+  <function name="protection" value="eressea_building_protection"/>
+  <function name="taxes" value="eressea_building_taxes"/>
+  <construction skill="building" minskill="1" maxsize="2" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="1" maxsize="8" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="2" maxsize="40" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="3" maxsize="200" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="4" maxsize="1000" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="5" maxsize="5000" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+  <construction skill="building" minskill="6" reqsize="1">
+    <requirement type="stone" quantity="1"/>
+  </construction>
+</building>
diff --git a/src/res/buildings.xml b/src/res/common/buildings.xml
similarity index 100%
rename from src/res/buildings.xml
rename to src/res/common/buildings.xml
diff --git a/src/res/e3a.xml b/src/res/e3a.xml
index d7b7582b5..b03fe1cd6 100644
--- a/src/res/e3a.xml
+++ b/src/res/e3a.xml
@@ -16,26 +16,26 @@
   <xi:include href="spoils.xml"/>
   <xi:include href="prefixes.xml"/>
   <!--xi:include href="ships.xml"/-->
-  <xi:include href="buildings.xml"/>
+  <xi:include href="common/buildings.xml"/>
   <xi:include href="equipment.xml"/>
   <!--xi:include href="terrains.xml"/-->
   <xi:include href="dungeons.xml"/>
   <xi:include href="directions.xml"/>
 
-  <xi:include href="e2k9/ships.xml"/>
-  <xi:include href="e2k9/shipnames.xml"/>
-  <xi:include href="e2k9/terrains.xml"/>
-  <xi:include href="e2k9/calendar.xml"/>
-  <xi:include href="e2k9/items.xml" />
-  <xi:include href="e2k9/strings.xml"/>
-  <xi:include href="e2k9/races.xml"/>
-  <xi:include href="e2k9/buildings.xml"/>
-  <xi:include href="e2k9/equipment.xml"/>
-  <xi:include href="e2k9/spells.xml"/>
-  <xi:include href="e2k9/luxuries.xml" />
-  <xi:include href="e2k9/weapons.xml" />
-  <xi:include href="e2k9/armor.xml" />
-  <xi:include href="e2k9/resources.xml" />
+  <xi:include href="e3a/ships.xml"/>
+  <xi:include href="e3a/shipnames.xml"/>
+  <xi:include href="e3a/terrains.xml"/>
+  <xi:include href="e3a/calendar.xml"/>
+  <xi:include href="e3a/items.xml" />
+  <xi:include href="e3a/strings.xml"/>
+  <xi:include href="e3a/races.xml"/>
+  <xi:include href="e3a/buildings.xml"/>
+  <xi:include href="e3a/equipment.xml"/>
+  <xi:include href="e3a/spells.xml"/>
+  <xi:include href="e3a/luxuries.xml" />
+  <xi:include href="e3a/weapons.xml" />
+  <xi:include href="e3a/armor.xml" />
+  <xi:include href="e3a/resources.xml" />
 
   <equipment>
     <set name="first_unit">
diff --git a/src/res/e3a/buildings.xml b/src/res/e3a/buildings.xml
index cbc635ae1..ed1105a00 100644
--- a/src/res/e3a/buildings.xml
+++ b/src/res/e3a/buildings.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0"?>
-<buildings>
+<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <xi:include href="../buildings/castle-2.xml" />
+
   <building name="watch" capacity="1" protection="yes" taxes="true">
     <function name="name" value="fort_name"/>
+    <function name="protection" value="lua_building_protection"/>
+    <function name="taxes" value="lua_building_taxes"/>
     <construction skill="building" minskill="1" maxsize="4" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
diff --git a/src/res/eressea.xml b/src/res/eressea.xml
index a8f71b6ac..ee6332116 100644
--- a/src/res/eressea.xml
+++ b/src/res/eressea.xml
@@ -17,7 +17,8 @@
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>
   <xi:include href="ships.xml"/>
-  <xi:include href="buildings.xml"/>
+  <xi:include href="common/buildings.xml"/>
+  <xi:include href="eressea/buildings.xml"/>
   <xi:include href="eressea/calendar.xml"/>
   <xi:include href="equipment.xml"/>
   <xi:include href="eressea/equipment.xml"/>
diff --git a/src/res/eressea/temple.xml b/src/res/eressea/buildings.xml
similarity index 82%
rename from src/res/eressea/temple.xml
rename to src/res/eressea/buildings.xml
index 4f3c1b2bf..374ce58e0 100644
--- a/src/res/eressea/temple.xml
+++ b/src/res/eressea/buildings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<buildings>
+<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
   <building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
   <building name="wormhole" maxsize="4" capacity="1" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="portal" maxsize="2" capacity="1" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="pavilion" maxsize="2" capacity="1" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
+  <xi:include href="../buildings/castle.xml" />
 </buildings>
diff --git a/src/res/resources/iron.xml b/src/res/resources/iron.xml
index bba5122c1..94dbc6390 100644
--- a/src/res/resources/iron.xml
+++ b/src/res/resources/iron.xml
@@ -6,7 +6,7 @@
   <resourcelimit>
     <modifier building="mine" type="skill" value="1"/>
     <modifier building="mine" type="material" value="0.5"/>
-    <modifier race="dwarf" type="material" value="0.75"/>
+    <modifier race="dwarf" type="material" value="0.60"/>
     <guard flag="mining"/>
   </resourcelimit>
 </resource>
diff --git a/src/res/resources/stone-2.xml b/src/res/resources/stone-2.xml
index c7883a5e6..7983b848a 100644
--- a/src/res/resources/stone-2.xml
+++ b/src/res/resources/stone-2.xml
@@ -6,6 +6,6 @@
   <resourcelimit>
     <modifier building="quarry" type="skill" value="1"/>
     <modifier building="quarry" type="material" value="0.5"/>
-    <modifier race="dwarf" type="material" value="0.75"/>
+    <modifier race="dwarf" type="material" value="0.60"/>
   </resourcelimit>
 </resource>