diff --git a/res/buildings/castle-2.xml b/res/buildings/castle-2.xml
index 7e64f88af..accb92c08 100644
--- a/res/buildings/castle-2.xml
+++ b/res/buildings/castle-2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="castle" capacity="1" fort="yes" taxes="100">
+<building name="castle" fort="yes" taxes="100">
   <construction skill="building" minskill="1" maxsize="10" name="site">
     <requirement type="stone" quantity="1"/>
   </construction>
diff --git a/res/buildings/castle.xml b/res/buildings/castle.xml
index 78ce7066c..ce64e8030 100644
--- a/res/buildings/castle.xml
+++ b/res/buildings/castle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="castle" capacity="1" fort="yes">
+<building name="castle" fort="yes">
   <construction skill="building" minskill="1" maxsize="2" name="site">
     <requirement type="stone" quantity="1"/>
   </construction>
diff --git a/res/core/common/buildings.xml b/res/core/common/buildings.xml
index 64edc8a34..932326f1c 100644
--- a/res/core/common/buildings.xml
+++ b/res/core/common/buildings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <buildings>
-  <building name="wormhole" maxsize="4" capacity="1" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
+  <building name="wormhole" maxsize="4" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="illusioncastle" capacity="0" maxcapacity="0" maxsize="0" nobuild="yes"/>
   <building name="xmas_exit" maxsize="10" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes"/>
-  <building name="caldera" capacity="1" nodestroy="yes" nobuild="yes"/>
+  <building name="caldera" nodestroy="yes" nobuild="yes"/>
   <building name="building" namechange="no" maxsize="1" nobuild="yes"/>
 
   <building name="blessedstonecircle" maxcapacity="3" maxsize="100" nobuild="yes" magic="yes" magres="60" magresbonus="30" auraregen="1.50">
@@ -20,7 +20,7 @@
     </construction>
   </building>
 
-  <building name="inn" capacity="1">
+  <building name="inn">
     <maintenance type="money" amount="5" variable="yes"/>
     <construction skill="building" minskill="2" reqsize="10">
       <requirement type="iron" quantity="10"/>
@@ -30,7 +30,7 @@
     </construction>
   </building>
 
-  <building name="tunnel" capacity="1" maxsize="100">
+  <building name="tunnel" maxsize="100">
     <maintenance type="stone" amount="2"/>
     <maintenance type="money" amount="100"/>
     <construction skill="building" minskill="6" reqsize="100">
@@ -41,7 +41,7 @@
     </construction>
   </building>
 
-  <building name="caravan" capacity="1" maxsize="10">
+  <building name="caravan" maxsize="10">
     <maintenance type="horse" amount="2"/>
     <maintenance type="money" amount="3000"/>
     <construction skill="building" minskill="2" reqsize="10">
@@ -52,7 +52,7 @@
     </construction>
   </building>
 
-  <building name="dam" capacity="1" maxsize="50">
+  <building name="dam" maxsize="50">
     <maintenance type="log" amount="3"/>
     <maintenance type="money" amount="1000"/>
     <construction skill="building" minskill="4" reqsize="50">
@@ -63,7 +63,7 @@
     </construction>
   </building>
 
-  <building name="monument" namechange="no" capacity="1">
+  <building name="monument" namechange="no">
     <construction skill="building" minskill="4">
       <requirement type="log" quantity="1"/>
       <requirement type="stone" quantity="1"/>
@@ -72,7 +72,7 @@
     </construction>
   </building>
 
-  <building name="stables" capacity="1">
+  <building name="stables">
     <maintenance type="money" amount="150"/>
     <construction skill="building" minskill="2">
       <requirement type="log" quantity="4"/>
@@ -82,7 +82,7 @@
     </construction>
   </building>
 
-  <building name="sawmill" capacity="1">
+  <building name="sawmill">
     <maintenance type="money" amount="250"/>
     <construction skill="building" minskill="3">
       <requirement type="log" quantity="5"/>
@@ -92,7 +92,7 @@
     </construction>
   </building>
 
-  <building name="smithy" capacity="1">
+  <building name="smithy">
     <maintenance type="money" amount="300"/>
     <maintenance type="log" amount="1"/>
     <construction skill="building" minskill="3">
@@ -127,7 +127,7 @@
     </construction>
   </building>
 
-  <building name="harbour" capacity="1" maxcapacity="25" maxsize="25" unique="yes">
+  <building name="harbour" maxcapacity="25" maxsize="25" unique="yes">
     <maintenance type="money" amount="250"/>
     <construction skill="building" minskill="3" reqsize="25">
       <requirement type="log" quantity="125"/>
@@ -136,7 +136,7 @@
     </construction>
   </building>
 
-  <building name="quarry" capacity="1">
+  <building name="quarry">
     <maintenance type="money" amount="250"/>
     <construction skill="building" minskill="2">
       <requirement type="iron" quantity="1"/>
@@ -146,7 +146,7 @@
     </construction>
   </building>
 
-  <building name="mine" capacity="1">
+  <building name="mine">
     <maintenance type="money" amount="500"/>
     <construction skill="building" minskill="4">
       <requirement type="iron" quantity="1"/>
@@ -156,7 +156,7 @@
     </construction>
   </building>
 
-  <building name="lighthouse" capacity="1" maxcapacity="4">
+  <building name="lighthouse" maxcapacity="4">
     <maintenance type="money" amount="100"/>
     <construction skill="building" minskill="3">
       <requirement type="iron" quantity="1"/>
diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml
index 8641fd89e..069a24150 100644
--- a/res/e3a/buildings.xml
+++ b/res/e3a/buildings.xml
@@ -3,7 +3,7 @@
 
   <xi:include href="config://default/buildings/castle-2.xml" />
 
-  <building name="watch" maxsize="10" capacity="1" fort="yes" taxes="200">
+  <building name="watch" maxsize="10" fort="yes" taxes="200">
     <construction skill="building" minskill="1" maxsize="5" name="scaffolding">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -15,7 +15,7 @@
     </construction>
   </building>
 
-  <building name="market" capacity="1" maxsize="10">
+  <building name="market" maxsize="10">
     <maintenance type="money" amount="200"/>
     <construction skill="building" minskill="3">
       <requirement type="log" quantity="1"/>
diff --git a/res/eressea/buildings.xml b/res/eressea/buildings.xml
index 670ab484e..1559fd987 100644
--- a/res/eressea/buildings.xml
+++ b/res/eressea/buildings.xml
@@ -2,7 +2,7 @@
 <buildings xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../buildings/castle.xml"/>
   <building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
-  <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" />
+  <building name="portal" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
+  <building name="pavilion" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="artacademy" maxsize="100" nobuild="yes" nodestroy="yes" unique="yes"/>
 </buildings>