diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c
index e7a3df109..b7e93183d 100644
--- a/src/common/items/weapons.c
+++ b/src/common/items/weapons.c
@@ -57,7 +57,6 @@ enum {
 	WP_EOGSWORD,
 	WP_CATAPULT,
 	WP_LONGBOW,
-	WP_CROSSBOW,
 	WP_SPEAR,
 	WP_LANCE,
 	WP_RUSTY_HALBERD,
@@ -67,7 +66,6 @@ enum {
 
 enum {
 	RL_CATAPULT,
-	RL_CROSSBOW,
 	RL_MAX,
 	RL_NONE
 };
@@ -110,8 +108,6 @@ static weapondata weapontable[WP_MAX + 1] =
 	{0.00, "3d10+5", "3d10+5", I_CATAPULT, SK_CATAPULT, 0, 0, true, false, { RL_CATAPULT, 5 }, BASH },
 	/* Langbogen */
 	{0.00, "1d11+1", "1d11+1", I_LONGBOW, SK_LONGBOW, 0, 0, true, false, { RL_NONE, 0 }, PIERCE },
-	/* Armbrust */
-	{0.00, "3d3+5", "3d3+5", I_CROSSBOW, SK_CROSSBOW, 0, 0, true, false, { RL_CROSSBOW, 2 }, PIERCE | ARMORPIERCING },
 	/* Speer */
 	{0.00, "1d10+0", "1d12+2", I_SPEAR, SK_SPEAR, 0, 0, false, false, { RL_NONE, 0}, PIERCE },
 	/* Lanze */
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 0e1e00426..6c972958b 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -897,10 +897,6 @@ static t_item itemdata[MAXITEMS] = {
 		{"Speer", "Speere", "Speer", "Speere"},
 		IS_PRODUCT, SK_WEAPONSMITH, 2, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL
 	},
-	{			/* I_CROSSBOW */
-		{"Armbrust", "Armbrüste", "Armbrust", "Armbrüste"},
-		IS_PRODUCT, SK_WEAPONSMITH, 3, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL
-	},
 	{			/* I_LONGBOW */
 		{"Bogen", "Bögen", "Bogen", "Bögen"},
 		IS_PRODUCT, SK_WEAPONSMITH, 2, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL
diff --git a/src/common/kernel/item.h b/src/common/kernel/item.h
index 95274e235..4f05049b0 100644
--- a/src/common/kernel/item.h
+++ b/src/common/kernel/item.h
@@ -283,7 +283,6 @@ enum {
 	I_WAGON,
 	I_CATAPULT,
 	I_SPEAR,
-	I_CROSSBOW,
 	I_LONGBOW,
 	I_CHAIN_MAIL,			/* 10 */
 	I_PLATE_ARMOR,
@@ -348,7 +347,6 @@ enum {
 	R_WAGON,
 	R_CATAPULT,
 	R_SPEAR,
-	R_CROSSBOW,
 	R_LONGBOW,
 	R_CHAIN_MAIL,
 	R_PLATE_ARMOR,
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index d4e3dd2c4..0dcc71343 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -26,7 +26,6 @@
 #define GUARD_DISABLES_PRODUCTION 1
 #define RESOURCE_QUANTITY 0.5
 #define RECRUITFRACTION 40    /* 100/RECRUITFRACTION% */
-#define CHANGED_CROSSBOWS 1
 #define COMBAT_TURNS 5
 #define PEASANTS_DO_NOT_STARVE 0
 #define NEW_MIGRATION 1
diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h
index 12b80a3b7..78a5c9262 100644
--- a/src/common/settings-tutorial.h
+++ b/src/common/settings-tutorial.h
@@ -26,7 +26,6 @@
 #define GUARD_DISABLES_PRODUCTION 1
 #define RESOURCE_QUANTITY 0.5
 #define RECRUITFRACTION 40    /* 100/RECRUITFRACTION% */
-#define CHANGED_CROSSBOWS 1
 #define COMBAT_TURNS 5
 #define PEASANTS_DO_NOT_STARVE 0
 #define NEW_MIGRATION 1
diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h
index 832785f64..67f21a189 100644
--- a/src/common/settings-vinyambar-3.h
+++ b/src/common/settings-vinyambar-3.h
@@ -26,7 +26,6 @@
 #define GUARD_DISABLES_PRODUCTION 1
 #define RESOURCE_QUANTITY 0.5
 #define RECRUITFRACTION 40		/* 100/RECRUITFRACTION% */
-#define CHANGED_CROSSBOWS 1
 #define NEWATSROI 0
 #define COMBAT_TURNS 5
 #define PEASANTS_DO_NOT_STARVE 0
diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h
index 18efecaba..e6f11a5bc 100644
--- a/src/common/settings-wdw.h
+++ b/src/common/settings-wdw.h
@@ -26,7 +26,6 @@
 #define GUARD_DISABLES_PRODUCTION 1
 #define RESOURCE_QUANTITY 0.5
 #define RECRUITFRACTION 40		/* 100/RECRUITFRACTION% */
-#define CHANGED_CROSSBOWS 1
 #define COMBAT_TURNS 5
 #define PEASANTS_DO_NOT_STARVE 0
 #define NEW_MIGRATION 1
diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml
index 3135a8ffe..48c30955b 100644
--- a/src/res/eressea/items.xml
+++ b/src/res/eressea/items.xml
@@ -75,4 +75,19 @@
     </item>
   </resource>
 
+  <!-- christmas items: start -->
+  <resource name="almond">
+    <item weight="0"/>
+  </resource>
+  <resource name="apple">
+    <item weight="0"/>
+  </resource>
+  <resource name="nut">
+    <item weight="0"/>
+  </resource>
+  <resource name="cookie">
+    <item weight="0"/>
+  </resource>
+  <!-- christmas items: end -->
+
 </resources>
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 290336621..13c47d66c 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -18,22 +18,6 @@
     <item notlost="yes" weight="0"/>
   </resource>
 
-  <resource name="almond">
-    <item weight="0"/>
-  </resource>
-
-  <resource name="apple">
-    <item weight="0"/>
-  </resource>
-
-  <resource name="nut">
-    <item weight="0"/>
-  </resource>
-
-  <resource name="cookie">
-    <item weight="0"/>
-  </resource>
-
   <resource name="snowball">
     <!-- xmas gimmik -->
     <item notlost="yes" weight="0">
@@ -148,12 +132,25 @@
     </item>
   </resource>
 
+  <resource name="crossbow">
+    <item weight="100">
+      <construction skill="sk_weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="1"/>
+      </construction>
+      <weapon armorpiercing="true" pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2">
+        <damage type="rider" value="3d3+5"/>
+        <damage type="footman" value="3d3+5"/>
+        <modifier type="missile_target" value="2"/>
+      </weapon>
+    </item>
+  </resource>
+
   <resource name="mallorncrossbow">
     <item weight="100">
       <construction skill="sk_weaponsmithing" minskill="5" reqsize="1">
         <requirement type="mallorn" quantity="1"/>
       </construction>
-      <weapon pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
+      <weapon armorpiercing="true" pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
         <damage type="rider" value="3d3+5"/>
         <damage type="footman" value="3d3+5"/>
         <modifier type="missile_target" value="2"/>
diff --git a/src/res/vinyambar/wdw-resources.xml b/src/res/vinyambar/wdw-resources.xml
index 45b776b81..fce1a2d37 100644
--- a/src/res/vinyambar/wdw-resources.xml
+++ b/src/res/vinyambar/wdw-resources.xml
@@ -1,37 +1,47 @@
 <?xml version="1.0"?>
 <resources>
-	<resource name="magicskillboost">
-		<comment>Boost a magician's skill to level 3</comment>
-		<item notlost="yes" weight="0">
-			<function name="use" value="usemagicboost"></function>
-		</item>
-	</resource>
-	<resource name="opal" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="diamond" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="zaphire" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="topaz" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="beryl" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="agate" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="garnet" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-	<resource name="emerald" appearance="gem">
-		<item weight="0"></item>
-	</resource>
-        <resource name="papyrus">
-                <item weight="1">
-                </item>
-        </resource>
+  <resource name="magicskillboost">
+    <comment>Boost a magician's skill to level 3</comment>
+    <item notlost="yes" weight="0">
+      <function name="use" value="usemagicboost"></function>
+    </item>
+  </resource>
+
+  <resource name="opal" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="diamond" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="zaphire" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="topaz" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="beryl" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="agate" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="garnet" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+  <resource name="emerald" appearance="gem">
+    <item weight="0"></item>
+  </resource>
+
+  <resource name="papyrus">
+    <item weight="1"/>
+  </resource>
+
+  <resource name="apple">
+    <item weight="0"/>
+  </resource>
+
+  <resource name="nut">
+    <item weight="0"/>
+  </resource>
+
 </resources>