diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 298230651..14f81154f 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -29,8 +29,8 @@
 #endif
 
 typedef enum combatmagic {
-	DO_PRECOMBATSPELL,
-	DO_POSTCOMBATSPELL
+  DO_PRECOMBATSPELL,
+  DO_POSTCOMBATSPELL
 } combatmagic_t;
 
 
diff --git a/src/mapper/autoseed.c b/src/mapper/autoseed.c
index 2be32af11..7f82af017 100644
--- a/src/mapper/autoseed.c
+++ b/src/mapper/autoseed.c
@@ -280,6 +280,7 @@ preferred_terrain(const struct race * rc)
 #define REGIONS_PER_FACTION 2
 #define MINFACTIONS 1
 #define MAXAGEDIFF 5
+#define VOLCANO_CHANCE 100
 
 int
 mkisland(int nsize)
@@ -343,7 +344,9 @@ mkisland(int nsize)
 				++rsize;
 			}
 		}
-		if (rand() % REGIONS_PER_FACTION == 0 || rsize==0) {
+    if (rand() % VOLCANO_CHANCE == 0) {
+      terraform(r, T_VOLCANO);
+    } else if (rand() % REGIONS_PER_FACTION == 0 || rsize==0) {
 			newfaction ** nfp, * nextf = newfactions;
 			unit * u;
 			terraform(r, preferred_terrain(nextf->race));
diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml
index f08390dae..99c6b06a0 100644
--- a/src/res/eressea/items.xml
+++ b/src/res/eressea/items.xml
@@ -30,4 +30,36 @@
     <item cursed="yes" notlost="yes" weight="0" />
   </resource>
 
+  <resource name="greatbow">
+    <function name="change" value="changeitem"/>
+    <item weight="100">
+      <construction skill="sk_weaponsmithing" minskill="5" reqsize="1">
+        <modifier function="mod_elves_only"/>
+        <requirement type="mallorn" quantity="2"/>
+      </construction>
+      <weapon pierce="true" missile="true" skill="sk_bow" offmod="0" defmod="0" reload="0" magres="0.0">
+        <damage type="rider" value="2d6+4"/>
+        <damage type="footman" value="2d6+4"/>
+        <modifier type="missile_target" value="2"/>
+        <modifier type="damage" value="1">
+          <race name="elf"/>
+        </modifier>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="halberd">
+    <item weight="200">
+      <construction skill="sk_weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="2"/>
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="sk_polearm" offmod="-1" defmod="2" magres="0.0">
+        <damage type="rider" value="2d6+3"/>
+        <damage type="footman" value="2d6+3"/>
+        <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
+      </weapon>
+    </item>
+  </resource>
+
 </resources>
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 6656b1307..f9b205095 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -26,24 +26,6 @@
     <item notlost="yes" weight="1"/>
   </resource>
 
-  <resource name="greatbow">
-    <function name="change" value="changeitem"/>
-    <item weight="100">
-      <construction skill="sk_weaponsmithing" minskill="5" reqsize="1">
-        <modifier function="mod_elves_only"/>
-        <requirement type="mallorn" quantity="1"/>
-      </construction>
-      <weapon pierce="true" missile="true" skill="sk_bow" offmod="0" defmod="0" reload="0" magres="0.0">
-        <damage type="rider" value="2d6+4"/>
-        <damage type="footman" value="2d6+4"/>
-        <modifier type="missile_target" value="2"/>
-        <modifier type="damage" value="1">
-          <race name="elf"/>
-        </modifier>
-      </weapon>
-    </item>
-  </resource>
-
   <resource name="mallornbow">
     <item weight="100">
       <construction skill="sk_weaponsmithing" minskill="5" reqsize="1">
@@ -97,18 +79,4 @@
     </item>
   </resource>
 
-  <resource name="halberd">
-    <item weight="200">
-      <construction skill="sk_weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="1"/>
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="sk_polearm" offmod="-1" defmod="2" magres="0.0">
-        <damage type="rider" value="2d6+3"/>
-        <damage type="footman" value="2d6+3"/>
-        <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
-      </weapon>
-    </item>
-  </resource>
-
 </resources>
diff --git a/src/res/vinyambar-wdw.xml b/src/res/vinyambar-wdw.xml
index b4288087f..2c806fd7e 100644
--- a/src/res/vinyambar-wdw.xml
+++ b/src/res/vinyambar-wdw.xml
@@ -42,6 +42,7 @@
   <xi:include href="vinyambar/wdw-strings.xml"/>
   <xi:include href="vinyambar/wdw-resources.xml" />
   <xi:include href="vinyambar/wdw-races.xml"/>
+  <xi:include href="vinyambar/items.xml"/>
   <xi:include href="vinyambar/de/strings.xml"/>
 
   <strings>