diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile
index 0fa594ae2..1e217cd56 100644
--- a/src/eressea/Jamfile
+++ b/src/eressea/Jamfile
@@ -29,7 +29,7 @@ LinkLibraries $(SERVER) :
 LinkLibraries $(LUASERVER) :
  gamecode kernel items modules attributes spells races triggers util ;
  
-LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm -lxml2 -liconv ;
+LINKLIBS on $(SERVER) += -L$(LUABIND_ROOT)/lib -lm -lxml2 ;
 LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
 LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ -lxml2 -liconv ;
 # -Wl,-R,$(HOME)/software/$(HOST)/lib ;
diff --git a/src/eressea/main.c b/src/eressea/main.c
index 6366ee735..a3c98a3c8 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -59,6 +59,7 @@
 #include <laws.h>
 
 /* kernel includes */
+#include <kernel/xmlreader.h>
 #include <building.h>
 #include <creport.h>
 #include <faction.h>
@@ -79,6 +80,7 @@
 
 /* util includes */
 #include <rand.h>
+#include <util/xml.h>
 #include <log.h>
 #include <sql.h>
 #include <base36.h>
@@ -171,12 +173,13 @@ game_init(void)
 	register_dungeon();
 #endif
 
-	init_data(xmlfile);
-	init_locales();
+  register_xmlreader();
+  init_data(xmlfile);
 
-	init_attributes();
-	init_resources();
-	init_items();
+  init_locales();
+  init_attributes();
+  init_races();
+  init_items();
   init_races();
 	init_economy();
 #if NEW_RESOURCEGROWTH
diff --git a/src/mapper/Jamfile b/src/mapper/Jamfile
index f5df71af1..bdadf535f 100644
--- a/src/mapper/Jamfile
+++ b/src/mapper/Jamfile
@@ -30,4 +30,4 @@ LinkLibraries mapper :
  triggers
  util ;
  
-LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses -lxml2 -liconv ;
+LINKLIBS on mapper += -L$(LUABIND_ROOT)/lib -lm -lncurses -lxml2 ;
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 2d0d42b4b..4c9816070 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -46,6 +46,7 @@
 #endif
 
 /* kernel includes */
+#include <kernel/xmlreader.h>
 #include <item.h>
 #include <faction.h>
 #include <race.h>
@@ -1718,12 +1719,13 @@ main(int argc, char *argv[])
 #endif
 /*	register_dungeon(); */
 
-	init_data(xmlfile);
-	init_locales();
+  register_xmlreader();
+  init_data(xmlfile);
 
-	init_resources();
-	register_items();
-	init_attributes();
+  init_locales();
+  init_attributes();
+
+  init_resources();
 #if NEW_RESOURCEGROWTH
 	init_rawmaterials();
 #endif
diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml
index cacf2e0bd..6f45a631d 100644
--- a/src/res/tutorial.xml
+++ b/src/res/tutorial.xml
@@ -33,7 +33,8 @@
 	<xi:include file="eressea/dungeons.xml"/>
 	<strings>
 		<string name="mailto">
-			<text>tutorial@eressea.upb.de</text>
+			<text locale="en">tutorial@eressea.upb.de</text>
+			<text locale="de">tutorial@eressea.upb.de</text>
 		</string>
 		<string name="mailcmd">
 			<text locale="de">ERESSEA BEFEHLE</text>