diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index f6b7a24df..897c7ca3b 100644
--- a/src/common/kernel/move.c
+++ b/src/common/kernel/move.c
@@ -260,22 +260,22 @@ get_transporters(const item * itm, int * p_animals, int *p_acap, int * p_vehicle
 static int
 ridingcapacity(unit * u)
 {
-	int vehicles = 0, vcap = 0;
+  int vehicles = 0, vcap = 0;
   int animals = 0, acap = 0;
 
   get_transporters(u->items, &animals, &acap, &vehicles, &vcap);
 
   /* Man trägt sein eigenes Gewicht plus seine Kapazität! Die Menschen
-   * tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
-   * von zwei Pferden gezogen wird */
+  ** tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
+  ** von zwei Pferden gezogen wird */
 
   animals = MIN(animals, effskill(u, SK_RIDING) * u->number * 2);
-	if (fval(u->race, RCF_HORSE)) animals += u->number;
+  if (fval(u->race, RCF_HORSE)) animals += u->number;
 
-	/* maximal diese Pferde können zum Ziehen benutzt werden */
-	vehicles = MIN(animals / HORSESNEEDED, vehicles);
+  /* maximal diese Pferde können zum Ziehen benutzt werden */
+  vehicles = MIN(animals / HORSESNEEDED, vehicles);
 
-	return vehicles * vcap + animals * acap;
+  return vehicles * vcap + animals * acap;
 }
 
 int
diff --git a/src/res/e3a-update.xml b/src/res/e3a-update.xml
deleted file mode 100644
index d7ead5147..000000000
--- a/src/res/e3a-update.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <races>
-    <xi:include href="races/goblin-e3a.xml"/>
-  </races>
-</eressea>
diff --git a/src/res/e3a/races.xml b/src/res/e3a/races.xml
index fd5cb583c..3fa648e11 100644
--- a/src/res/e3a/races.xml
+++ b/src/res/e3a/races.xml
@@ -3,27 +3,7 @@
 
   <!-- begin main races -->
 
-  <race name="goblin" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="60" maintenance="6" weight="600" capacity="440" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
-    <param name="hunger.damage" value="1d8+7"/>
-    <param name="other_race" value="demon"/>
-    <param name="other_cost" value="500"/>
-    <param name="recruit_multi" value="0.5"/>
-    <skill name="building" modifier="1"/>
-    <skill name="cartmaking" modifier="-1"/>
-    <skill name="catapult" modifier="1"/>
-    <skill name="magic" modifier="-99"/>
-    <skill name="mining" modifier="1"/>
-    <skill name="roadwork" modifier="-2"/>
-    <skill name="sailing" modifier="-2"/>
-    <skill name="shipcraft" modifier="-2"/>
-    <skill name="tactics" modifier="-2"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="rat" default="yes"/>
-    <familiar race="imp"/>
-  </race>
+  <xi:include href="races/goblin-3.xml"/>
 
   <race name="uruk" studyspeed="-5" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
diff --git a/src/res/races/goblin-3.xml b/src/res/races/goblin-3.xml
new file mode 100644
index 000000000..845b69c20
--- /dev/null
+++ b/src/res/races/goblin-3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<race name="goblin" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="60" maintenance="6" weight="600" capacity="440" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <ai splitsize="10000" moverandom="yes" learn="yes"/>
+  <function name="itemdrop" value="defaultdrops"/>
+  <param name="hunger.damage" value="1d8+7"/>
+  <param name="other_race" value="demon"/>
+  <param name="other_cost" value="500"/>
+  <param name="recruit_multi" value="0.5"/>
+  <skill name="cartmaking" modifier="-1"/>
+  <skill name="catapult" modifier="1"/>
+  <skill name="magic" modifier="-99"/>
+  <skill name="mining" modifier="1"/>
+  <skill name="roadwork" modifier="-2"/>
+  <skill name="sailing" modifier="-2"/>
+  <skill name="shipcraft" modifier="-2"/>
+  <skill name="tactics" modifier="-2"/>
+  <skill name="unarmed" modifier="-99"/>
+  <skill name="weaponsmithing" modifier="-1"/>
+  <attack type="1" damage="1d5"/>
+  <familiar race="rat" default="yes"/>
+  <familiar race="imp"/>
+</race>
diff --git a/src/res/races/goblin-e3a.xml b/src/res/races/goblin-e3a.xml
index 845b69c20..7e23e28cf 100644
--- a/src/res/races/goblin-e3a.xml
+++ b/src/res/races/goblin-e3a.xml
@@ -6,6 +6,7 @@
   <param name="other_race" value="demon"/>
   <param name="other_cost" value="500"/>
   <param name="recruit_multi" value="0.5"/>
+  <skill name="building" modifier="1"/>
   <skill name="cartmaking" modifier="-1"/>
   <skill name="catapult" modifier="1"/>
   <skill name="magic" modifier="-99"/>
@@ -15,7 +16,6 @@
   <skill name="shipcraft" modifier="-2"/>
   <skill name="tactics" modifier="-2"/>
   <skill name="unarmed" modifier="-99"/>
-  <skill name="weaponsmithing" modifier="-1"/>
   <attack type="1" damage="1d5"/>
   <familiar race="rat" default="yes"/>
   <familiar race="imp"/>
diff --git a/src/scripts/run-e3a.lua b/src/scripts/run-e3a.lua
index c608a17c6..95972bdea 100644
--- a/src/scripts/run-e3a.lua
+++ b/src/scripts/run-e3a.lua
@@ -197,7 +197,7 @@ function process(orders)
 
   -- use newfactions file to place out new players
   -- autoseed(basepath .. "/newfactions", false)
-  read_xml(resourcepath.."/e3a-update.xml")
+  -- read_xml(resourcepath.."/e3a-update.xml")
 
   write_files(locales)
   write_statistics()