diff --git a/eressea.sln b/eressea.sln
index 199bddf66..481c4854b 100644
--- a/eressea.sln
+++ b/eressea.sln
@@ -29,6 +29,7 @@ Global
 		{52764450-41CA-11E0-B2EC-3136E0D72085}.Debug|Win32.ActiveCfg = Debug|Win32
 		{52764450-41CA-11E0-B2EC-3136E0D72085}.Release|Win32.ActiveCfg = Release|Win32
 		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.Build.0 = Debug|Win32
 		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Release|Win32.ActiveCfg = Release|Win32
 		{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/res/e3a/spellbooks/cerddor.xml b/res/e3a/spellbooks/cerddor.xml
new file mode 100644
index 000000000..8467b4ed1
--- /dev/null
+++ b/res/e3a/spellbooks/cerddor.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="cerddor">
+    <entry spell="earn_silver#cerddor" level="1" />
+    <entry spell="song_of_healing" level="2" />
+    <entry spell="generous" level="2" />
+    <entry spell="song_of_fear" level="3" />
+    <entry spell="song_of_confusion" level="4" />
+    <entry spell="blabbermouth" level="4" />
+    <entry spell="heroic_song" level="5" />
+    <entry spell="seduction" level="6" />
+    <entry spell="calm_monster" level="6" />
+    <entry spell="bloodthirst" level="7" />
+    <entry spell="frighten" level="8" />
+    <entry spell="cerddor_destroymagic" level="8" />
+    <entry spell="migration" level="9" />
+    <entry spell="raise_mob" level="10" />
+    <entry spell="song_resist_magic" level="10" />
+    <entry spell="create_roqf" level="11" />
+    <entry spell="song_of_peace" level="12" />
+    <entry spell="song_suscept_magic" level="12" />
+    <entry spell="song_of_slavery" level="13" />
+    <entry spell="big_recruit" level="14" />
+    <entry spell="calm_riot" level="14" />
+    <entry spell="incite_riot" level="15" />
+</spellbook>
diff --git a/res/e3a/spellbooks/common.xml b/res/e3a/spellbooks/common.xml
new file mode 100644
index 000000000..67f914623
--- /dev/null
+++ b/res/e3a/spellbooks/common.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="common">
+    <entry spell="goodwinds" level="4" />
+    <entry spell="create_trollbelt" level="9" />
+    <entry spell="create_antimagic" level="7" />
+    <entry spell="create_rop" level="9" />
+    <entry spell="create_bagofholding" level="10" />
+    <entry spell="create_focus" level="9" />
+    <entry spell="create_ror" level="9" />
+    <entry spell="plague" level="7" />
+    <entry spell="raindance" level="2" />
+    <entry spell="irongolem" level="2" />
+    <entry spell="reelingarrows" level="5" />
+    <entry spell="antimagiczone" level="5" />
+    <entry spell="steal_aura" level="6" />
+    <entry spell="auraleak" level="9" />
+    <entry spell="strongwall" level="8" />
+    <entry spell="homestone" level="7" />
+    <entry spell="forestfire" level="10" />
+    <entry spell="disturbingdreams" level="6" />
+    <entry spell="appeasement" level="1" />
+    <entry spell="ironkeeper" level="3" />
+    <entry spell="airship" level="6" />
+    <entry spell="sound_out" level="7" />
+    <entry spell="combat_speed" level="9" />
+    <entry spell="double_time" level="11" />
+    <entry spell="magicstreet" level="4" />
+    <entry spell="sacrifice_strength" level="15" />
+    <entry spell="resist_magic" level="3" />
+    <entry spell="protective_runes" level="8" />
+    <entry spell="analyze_magic" level="1" />
+    <entry spell="destroy_magic" level="5" />
+    <entry spell="break_curse" level="7" />
+    <entry spell="fish_shield" level="8" />
+    <entry spell="armor_shield" level="12" />
+    <entry spell="living_rock" level="13" />
+    <entry spell="summon_familiar" level="9" />
+    <entry spell="draigfumbleshield" level="9" />
+    <entry spell="gwyrrdfumbleshield" level="5" />
+    <entry spell="cerrdorfumbleshield" level="5" />
+    <entry spell="tybiedfumbleshield" level="2" />
+    <entry spell="concealing_aura" level="1" />
+    <entry spell="shockwave" level="5" />
+    <entry spell="eternal_walls" level="7" />
+</spellbook>
diff --git a/res/e3a/spellbooks/draig.xml b/res/e3a/spellbooks/draig.xml
new file mode 100644
index 000000000..6ce282db6
--- /dev/null
+++ b/res/e3a/spellbooks/draig.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="draig">
+    <entry spell="sparklechaos" level="1" />
+    <entry spell="earn_silver#draig" level="1" />
+    <entry spell="fireball" level="2" />
+    <entry spell="magicboost" level="3" />
+    <entry spell="bloodsacrifice" level="4" />
+    <entry spell="berserk" level="5" />
+    <entry spell="fumblecurse" level="5" />
+    <entry spell="combatrust" level="6" />
+    <entry spell="summonundead" level="6" />
+    <entry spell="firewall" level="7" />
+    <entry spell="chaosrow" level="8" />
+    <entry spell="summonshadow" level="8" />
+    <entry spell="undeadhero" level="9" />
+    <entry spell="draigdestroymagic" level="10" />
+    <entry spell="deathcloud" level="11" />
+    <entry spell="summondragon" level="11" />
+    <entry spell="summonshadowlords" level="12" />
+    <entry spell="create_firesword" level="12" />
+    <entry spell="unholypower" level="14" />
+</spellbook>
diff --git a/res/e3a/spellbooks/gray.xml b/res/e3a/spellbooks/gray.xml
new file mode 100644
index 000000000..517add0e3
--- /dev/null
+++ b/res/e3a/spellbooks/gray.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gray">
+    <entry spell="fiery_dragonbreath" level="3" />
+    <entry spell="icy_dragonbreath" level="6" />
+    <entry spell="powerful_dragonbreath" level="12" />
+    <entry spell="meteor_rain" level="3" />
+    <entry spell="wyrm_transformation" level="1" />
+    <entry spell="transferauratraum" level="3" />
+    <entry spell="drain_skills" level="12" />
+    <entry spell="aura_of_fear" level="12" />
+    <entry spell="shadowcall" level="12" />
+    <entry spell="immolation" level="12" />
+    <entry spell="firestorm" level="8" />
+    <entry spell="coldfront" level="8" />
+    <entry spell="acidrain" level="8" />
+</spellbook>
diff --git a/res/e3a/spellbooks/gwyrrd.xml b/res/e3a/spellbooks/gwyrrd.xml
new file mode 100644
index 000000000..3cfe9f5e2
--- /dev/null
+++ b/res/e3a/spellbooks/gwyrrd.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gwyrrd">
+  <entry spell="blessedharvest" level="3" />
+  <entry spell="earn_silver#gwyrrd" level="1" />
+  <entry spell="stonegolem" level="20" />
+  <entry spell="treegrow" level="2" />
+  <entry spell="hail" level="3" />
+  <entry spell="windshield" level="4" />
+  <entry spell="healing" level="5" />
+  <entry spell="earthquake" level="6" />
+  <entry spell="stormwinds" level="6" />
+  <entry spell="wolfhowl" level="7" />
+  <entry spell="versteinern" level="8" />
+  <entry spell="gwyrrddestroymagic" level="8" />
+  <entry spell="holyground" level="9" />
+  <entry spell="summonent" level="10" />
+  <entry spell="blessstonecircle" level="11" />
+  <entry spell="barkskin" level="12" />
+  <entry spell="summonfireelemental" level="13" />
+  <entry spell="maelstrom" level="15" />
+  <entry spell="rustweapon" level="3" />
+</spellbook>
diff --git a/res/e3a/spellbooks/illaun.xml b/res/e3a/spellbooks/illaun.xml
new file mode 100644
index 000000000..31a6d8ada
--- /dev/null
+++ b/res/e3a/spellbooks/illaun.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="illaun">
+  <entry spell="shadowknights" level="1" />
+  <entry spell="sparkledream" level="1" />
+  <entry spell="earn_silver#illaun" level="1" />
+  <entry spell="flee" level="2" />
+  <entry spell="puttorest" level="2" />
+  <entry spell="shapeshift" level="3" />
+  <entry spell="icastle" level="3" />
+  <entry spell="dreamreading" level="4" />
+  <entry spell="tiredsoldiers" level="4" />
+  <entry spell="reanimate" level="5" />
+  <entry spell="disturbingdreams" level="6" />
+  <entry spell="sleep" level="7" />
+  <entry spell="readmind" level="7" />
+  <entry spell="gooddreams" level="8" />
+  <entry spell="illaundestroymagic" level="8" />
+  <entry spell="clone" level="9" />
+  <entry spell="bad_dreams" level="10" />
+  <entry spell="mindblast" level="11" />
+  <entry spell="create_dreameye" level="14" />
+</spellbook>
diff --git a/res/e3a/spellbooks/tybied.xml b/res/e3a/spellbooks/tybied.xml
new file mode 100644
index 000000000..e71ab45b5
--- /dev/null
+++ b/res/e3a/spellbooks/tybied.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="tybied">
+  <entry spell="create_potion_p2" level="2" />
+  <entry spell="create_potion_p0" level="3" />
+  <entry spell="create_potion_p9" level="4" />
+  <entry spell="create_potion_peasantblood" level="5" />
+  <entry spell="create_potion_ointment" level="6" />
+  <entry spell="create_potion_p3" level="7" />
+  <entry spell="create_potion_p14" level="8" />
+  <entry spell="create_potion_p13" level="9" />
+  <entry spell="create_roi" level="7" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="auratransfer" level="5" />
+</spellbook>
diff --git a/res/e3a/spells.xml b/res/e3a/spells.xml
index 80c59fa8e..c677cd6d2 100644
--- a/res/e3a/spells.xml
+++ b/res/e3a/spells.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<spells>
-<!-- new illaun -->
+<spells xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <xi:include href="spellbooks/common.xml"/>
+  <xi:include href="spellbooks/gray.xml"/>
+  <xi:include href="spellbooks/gwyrrd.xml"/>
+  <xi:include href="spellbooks/draig.xml"/>
+  <xi:include href="spellbooks/illaun.xml"/>
+  <xi:include href="spellbooks/cerddor.xml"/>
+  <xi:include href="spellbooks/tybied.xml"/>
+
+    <!-- new illaun -->
   <spell name="shadowknights" type="illaun" rank="4" level="1" index="147" variable="true" combat="1">
     <!-- Schattenritter -->
     <resource name="aura" amount="1" cost="level"/>
@@ -601,27 +610,11 @@
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="laen" amount="5" cost="fixed"/>
   </spell>
-  <spell name="commonfamiliar" type="common" rank="5" level="9" index="118">
+  <spell name="summon_familiar" type="common" rank="5" level="9" index="118">
     <function name="cast" value="cast_familiar"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
-  <spell name="gwyrrdfamiliar" type="common" rank="5" level="10" index="119">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="draigfamiliar" type="common" rank="5" level="13" index="120">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="summon_familiar" type="cerddor" rank="5" level="9" index="121">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
-  <spell name="summon_familiar" type="common" rank="5" level="12" index="122">
-    <resource name="aura" amount="100" cost="fixed"/>
-    <resource name="permaura" amount="5" cost="fixed"/>
-  </spell>
   <spell name="draigfumbleshield" type="common" rank="2" level="9" index="143" variable="true" combat="1">
     <resource name="aura" amount="6" cost="level"/>
   </spell>
diff --git a/res/eressea/spellbooks/cerddor.xml b/res/eressea/spellbooks/cerddor.xml
new file mode 100644
index 000000000..0609b0141
--- /dev/null
+++ b/res/eressea/spellbooks/cerddor.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="cerddor">
+  <entry spell="song_of_healing" level="2" />
+  <entry spell="song_of_confusion" level="4" />
+  <entry spell="song_of_fear" level="3" />
+  <entry spell="bloodthirst" level="7" />
+  <entry spell="transfer_aura_song" level="5" />
+  <entry spell="appeasement" level="1" />
+  <entry spell="raise_mob" level="10" />
+  <entry spell="melancholy" level="11" />
+  <entry spell="headache" level="7" />
+  <entry spell="seduction" level="6" />
+  <entry spell="sound_out" level="7" />
+  <entry spell="calm_monster" level="6" />
+  <entry spell="heroic_song" level="5" />
+  <entry spell="frighten" level="8" />
+  <entry spell="courting" level="4" />
+  <entry spell="generous" level="2" />
+  <entry spell="song_of_peace" level="12" />
+  <entry spell="migration" level="9" />
+  <entry spell="calm_riot" level="15" />
+  <entry spell="incite_riot" level="16" />
+  <entry spell="song_resist_magic" level="10" />
+  <entry spell="song_suscept_magic" level="12" />
+  <entry spell="analysesong_unit" level="5" />
+  <entry spell="analyse_object" level="8" />
+  <entry spell="summon_familiar" level="9" />
+  <entry spell="song_of_slavery" level="13" />
+  <entry spell="cerddor_destroymagic" level="8" />
+  <entry spell="cerrdorfumbleshield" level="5" />
+  <entry spell="big_recruit" level="14" />
+  <entry spell="raindance" level="3" />
+  <entry spell="create_roi" level="6" />
+  <entry spell="earn_silver#cerddor" level="1" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="create_roqf" level="11" />
+  <entry spell="blabbermouth" level="4" />
+</spellbook>
diff --git a/res/eressea/spellbooks/draig.xml b/res/eressea/spellbooks/draig.xml
new file mode 100644
index 000000000..53b6eb020
--- /dev/null
+++ b/res/eressea/spellbooks/draig.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="draig">
+  <entry spell="fireball" level="2" />
+  <entry spell="combatrust" level="6" />
+  <entry spell="plague" level="7" />
+  <entry spell="magicboost" level="3" />
+  <entry spell="chaosrow" level="8" />
+  <entry spell="berserk" level="5" />
+  <entry spell="transferaurachaos" level="7" />
+  <entry spell="summonshadow" level="8" />
+  <entry spell="summonshadowlords" level="12" />
+  <entry spell="summonundead" level="6" />
+  <entry spell="auraleak" level="9" />
+  <entry spell="forestfire" level="10" />
+  <entry spell="chaossuction" level="14" />
+  <entry spell="deathcloud" level="11" />
+  <entry spell="summondragon" level="11" />
+  <entry spell="draigfamiliar" level="13" />
+  <entry spell="fumblecurse" level="5" />
+  <entry spell="draigdestroymagic" level="10" />
+  <entry spell="draigfumbleshield" level="9" />
+  <entry spell="firewall" level="7" />
+  <entry spell="sparklechaos" level="1" />
+  <entry spell="undeadhero" level="9" />
+  <entry spell="unholypower" level="14" />
+  <entry spell="bloodsacrifice" level="4" />
+  <entry spell="create_roi" level="6" />
+  <entry spell="earn_silver#draig" level="1" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="create_firesword" level="12" />
+  <entry spell="create_trollbelt" level="9" />
+</spellbook>
diff --git a/res/eressea/spellbooks/gray.xml b/res/eressea/spellbooks/gray.xml
new file mode 100644
index 000000000..afcf3165a
--- /dev/null
+++ b/res/eressea/spellbooks/gray.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gray">
+  <entry spell="fiery_dragonbreath" level="3" />
+  <entry spell="icy_dragonbreath" level="6" />
+  <entry spell="powerful_dragonbreath" level="12" />
+  <entry spell="meteor_rain" level="3" />
+  <entry spell="wyrm_transformation" level="1" />
+  <entry spell="drain_skills" level="12" />
+  <entry spell="aura_of_fear" level="12" />
+  <entry spell="shadowcall" level="12" />
+  <entry spell="immolation" level="12" />
+  <entry spell="firestorm" level="8" />
+  <entry spell="coldfront" level="8" />
+  <entry spell="acidrain" level="8" />
+  <entry spell="create_runesword" level="6" />
+  <entry spell="create_chastitybelt" level="7" />
+  <entry spell="create_focus" level="9" />
+  <entry spell="create_ror" level="9" />
+</spellbook>
+
diff --git a/res/eressea/spellbooks/gwyrrd.xml b/res/eressea/spellbooks/gwyrrd.xml
new file mode 100644
index 000000000..de4b585f8
--- /dev/null
+++ b/res/eressea/spellbooks/gwyrrd.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gwyrrd">
+  <entry spell="hail" level="3" />
+  <entry spell="rustweapon" level="3" />
+  <entry spell="treegrow" level="2" />
+  <entry spell="healing" level="5" />
+  <entry spell="maelstrom" level="15" />
+  <entry spell="transferauradruide" level="6" />
+  <entry spell="stonegolem" level="1" />
+  <entry spell="irongolem" level="2" />
+  <entry spell="reelingarrows" level="5" />
+  <entry spell="cold_protection" level="3" />
+  <entry spell="great_drought" level="17" />
+  <entry spell="strongwall" level="8" />
+  <entry spell="homestone" level="7" />
+  <entry spell="summonfireelemental" level="13" />
+  <entry spell="summonent" level="10" />
+  <entry spell="earthquake" level="6" />
+  <entry spell="ironkeeper" level="3" />
+  <entry spell="stormwinds" level="6" />
+  <entry spell="goodwinds" level="4" />
+  <entry spell="windshield" level="4" />
+  <entry spell="versteinern" level="8" />
+  <entry spell="treewalkenter" level="9" />
+  <entry spell="treewalkexit" level="9" />
+  <entry spell="magicstreet" level="4" />
+  <entry spell="wolfhowl" level="7" />
+  <entry spell="blessstonecircle" level="11" />
+  <entry spell="gwyrrdfamiliar" level="10" />
+  <entry spell="gwyrrddestroymagic" level="8" />
+  <entry spell="barkskin" level="12" />
+  <entry spell="gwyrrdfumbleshield" level="5" />
+  <entry spell="holyground" level="9" />
+  <entry spell="magic_roots" level="16" />
+  <entry spell="mallorntreegrow" level="4" />
+  <entry spell="blessedharvest" level="1" />
+  <entry spell="create_roi" level="6" />
+  <entry spell="earn_silver#gwyrrd" level="1" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="create_magicherbbag" level="5" />
+</spellbook>
diff --git a/res/eressea/spellbooks/illaun.xml b/res/eressea/spellbooks/illaun.xml
new file mode 100644
index 000000000..0d5d6f049
--- /dev/null
+++ b/res/eressea/spellbooks/illaun.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="illaun">
+  <entry spell="bad_dreams" level="10" />
+  <entry spell="gooddreams" level="8" />
+  <entry spell="dreamreading" level="4" />
+  <entry spell="tiredsoldiers" level="4" />
+  <entry spell="flee" level="2" />
+  <entry spell="transferauratraum" level="3" />
+  <entry spell="disturbingdreams" level="6" />
+  <entry spell="sleep" level="7" />
+  <entry spell="summon_alp" level="15" />
+  <entry spell="mindblast" level="11" />
+  <entry spell="reanimate" level="5" />
+  <entry spell="shapeshift" level="3" />
+  <entry spell="analysedream" level="5" />
+  <entry spell="orkdream" level="12" />
+  <entry spell="illaunfamiliar" level="9" />
+  <entry spell="icastle" level="3" />
+  <entry spell="illaundestroymagic" level="8" />
+  <entry spell="shadowknights" level="1" />
+  <entry spell="wisps" level="7" />
+  <entry spell="sparkledream" level="1" />
+  <entry spell="puttorest" level="2" />
+  <entry spell="clone" level="9" />
+  <entry spell="create_roi" level="6" />
+  <entry spell="earn_silver#illaun" level="1" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="create_dreameye" level="14" />
+  <entry spell="create_invisibility_sphere" level="13" />
+  <entry spell="readmind" level="7" />
+</spellbook>
+
diff --git a/res/eressea/spellbooks/tybied.xml b/res/eressea/spellbooks/tybied.xml
new file mode 100644
index 000000000..791180c19
--- /dev/null
+++ b/res/eressea/spellbooks/tybied.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="tybied">
+  <entry spell="auratransfer" level="5" />
+  <entry spell="antimagiczone" level="5" />
+  <entry spell="steal_aura" level="6" />
+  <entry spell="airship" level="6" />
+  <entry spell="enterastral" level="4" />
+  <entry spell="leaveastral" level="4" />
+  <entry spell="view_reality" level="10" />
+  <entry spell="astral_disruption" level="14" />
+  <entry spell="combat_speed" level="9" />
+  <entry spell="double_time" level="11" />
+  <entry spell="sacrifice_strength" level="15" />
+  <entry spell="resist_magic" level="3" />
+  <entry spell="keeploot" level="3" />
+  <entry spell="protective_runes" level="8" />
+  <entry spell="analyze_magic" level="1" />
+  <entry spell="destroy_magic" level="5" />
+  <entry spell="break_curse" level="7" />
+  <entry spell="fish_shield" level="8" />
+  <entry spell="armor_shield" level="12" />
+  <entry spell="living_rock" level="13" />
+  <entry spell="summon_familiar" level="12" />
+  <entry spell="tybiedfumbleshield" level="2" />
+  <entry spell="concealing_aura" level="1" />
+  <entry spell="pull_astral" level="6" />
+  <entry spell="fetch_astral" level="6" />
+  <entry spell="shockwave" level="5" />
+  <entry spell="eternal_walls" level="7" />
+  <entry spell="create_roi" level="6" />
+  <entry spell="earn_silver#tybied" level="1" />
+  <entry spell="create_aots" level="6" />
+  <entry spell="create_antimagic" level="7" />
+  <entry spell="create_rop" level="9" />
+  <entry spell="create_bagofholding" level="10" />
+</spellbook>
diff --git a/res/eressea/spells.xml b/res/eressea/spells.xml
index 0169e5361..66ce169e6 100644
--- a/res/eressea/spells.xml
+++ b/res/eressea/spells.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0"?>
-<spells>
+<spells xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <xi:include href="spellbooks/gray.xml"/>
+  <xi:include href="spellbooks/gwyrrd.xml"/>
+  <xi:include href="spellbooks/draig.xml"/>
+  <xi:include href="spellbooks/illaun.xml"/>
+  <xi:include href="spellbooks/cerddor.xml"/>
+  <xi:include href="spellbooks/tybied.xml"/>
+
   <spell name="fireball" type="draig" rank="5" level="2" index="4" variable="true" combat="2">
     <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>