diff --git a/navar_city/university b/navar_city/university
index f15a58e3c..975b213b4 100644
--- a/navar_city/university
+++ b/navar_city/university
@@ -8,7 +8,7 @@ enter_x 24
 enter_y 37
 msg
 Created:  2008-05-17 Nicolas Weeger
-Modified: 2008-05-20 Nicolas Weeger
+Modified: 2012-05-20 Nicolas Weeger
 endmsg
 maplore
 The university features:
@@ -1539,6 +1539,15 @@ arch marble
 x 7
 y 13
 end
+arch gnome2
+name Professor Lordil
+x 7
+y 13
+unaggressive 1
+arch npc_dialog
+name /navar_city/university_lordil.msg
+end
+end
 arch marble
 x 7
 y 14
@@ -2242,6 +2251,13 @@ arch white_wall_1_2
 x 10
 y 11
 end
+arch magic_mouth
+msg
+A sign on the door reads: professor Lordil
+endmsg
+x 10
+y 12
+end
 arch marble
 x 10
 y 12
diff --git a/navar_city/university_lordil.msg b/navar_city/university_lordil.msg
new file mode 100644
index 000000000..6d7bbef39
--- /dev/null
+++ b/navar_city/university_lordil.msg
@@ -0,0 +1,20 @@
+{
+  "rules": [
+  {
+  "match" : ["crystals"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=30"]],
+  "post" : [["quest", "wolfsburg/Heimser", "40"]],
+  "msg" : ["Oh, he always forgets, poor him.\n\nHe should melt them."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=30"]],
+  "post" : [],
+  "msg" : ["Hello."],
+  "replies" : [["crystals", "Heimser doesn't remember whether to melt or break the mithril crystals for his experiment.", "0"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Hello."]
+  }
+]}
diff --git a/wolfsburg/volcano/heimser.msg b/wolfsburg/volcano/heimser.msg
new file mode 100644
index 000000000..d123b1a6b
--- /dev/null
+++ b/wolfsburg/volcano/heimser.msg
@@ -0,0 +1,104 @@
+{
+  "rules": [
+  {
+  "match" : ["yes"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=40"]],
+  "post" : [["quest", "wolfsburg/Heimser", "50"], ["giveknowledge", "alchemy:2:2703:NONE"]],
+  "msg" : ["Ha, of course, thank you very much.\n\nSo, here is your reward.\n\nYou can make holy symbols, in a thaumaturgy desk, with a demon's icor and a messenger's head."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=40"]],
+  "post" : [],
+  "msg" : ["So, did you ask Lordil?"],
+  "replies" : [["yes", "Yes, you should melt the crystals.", "0"]]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=30"]],
+  "post" : [],
+  "msg" : ["Hum, somehow I doubt it."]
+  }, {
+  "match" : ["no"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=30"]],
+  "post" : [],
+  "msg" : ["*grumph*"]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=30"]],
+  "post" : [],
+  "msg" : ["So, did you ask Lordil?"]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=20"], ["item", "mithril crystal", "10"]],
+  "post" : [["takeitem", "mithril crystal", "10"], ["quest", "wolfsburg/Heimser", "30"]],
+  "msg" : ["Thank you.\n\nHum, I don't remember whether I should melt them, or break them in pieces. Say, could you ask my friend Lordil, in Navar, about that?"]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=20"]],
+  "post" : [],
+  "msg" : ["Where are they?"]
+  }, {
+  "match" : ["no"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=20"]],
+  "post" : [],
+  "msg" : ["All right..."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=20"]],
+  "post" : [],
+  "msg" : ["Hello $you, did you get 10 mithril crystals?"],
+  "replies" : [["yes", "Yes, here they are.", "1"], ["no", "Not yet, sorry.", "1"]]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["npctoken", "status", "ask"]],
+  "post" : [["quest", "wolfsburg/Heimser", "20"]],
+  "msg" : ["Thank you very much. I'll of course reward you, be sure of that."]
+  }, {
+  "match" : ["no"],
+  "pre" : [["npctoken", "status", "ask"]],
+  "post" : [["setnpctoken", "status", "0"]],
+  "msg" : ["Ha well..."]
+  }, {
+  "match" : ["like"],
+  "pre" : [["npctoken", "status", "like"]],
+  "post" : [["setnpctoken", "status", "ask"]],
+  "msg" : ["About magical crystals and such.\n\nWhich remind me, I need 10 mithril crystals, would you be as kind as get them for me?"],
+  "replies" : [["yes", "Ok, I guess I can do that.", "1"], ["no", "Sorry, no.", "0"]]
+  }, {
+  "match" : ["lab"],
+  "pre" : [["npctoken", "status", "lab"]],
+  "post" : [["setnpctoken", "status", "like"]],
+  "msg" : ["I'm making various experiments."],
+  "replies" : [["like", "Like what?", "1"]]
+  }, {
+  "match" : ["brother"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["My brother Keiran and I always were pretty close. When the armies of Kurthan the Bloody took Wolfsburg, I managed to escape, but my brother didn't, and was put into slavery.  I really don't know if he's still alive or not.  That clock is the only souvenir I have from the happy times of our youth... *sigh*"]
+  }, {
+  "match" : ["Euthville"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["It was an city located at the north of Scorn, where people could build wonderful machines one can only dream of nowadays.  But their thirst for power killed them; today, only ruins remain from Euthville."]
+  }, {
+  "match" : ["clock"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["A pretty nice clock, he? It is really a rare antiquity.  It was built in Euthville, during the golden age of that city.  Can you imagine? That clock is hundreds of years old!  We found it in the ruins of the city long ago, and my brother fixed it.  My brother was a genius... *sigh*"]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "wolfsburg/Heimser", "=10"]],
+  "post" : [["setnpctoken", "status", "lab"]],
+  "msg" : ["I'm Heinkel Heimser.  What do you want from an old man like me? *sigh*"],
+  "replies" : [["lab", "What is your laboratory about?", "1"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["I'm Heinkel Heimser.  What do you want from an old man like me? *sigh*"]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : []
+  }
+]}
diff --git a/wolfsburg/volcano/heimser_hut_0 b/wolfsburg/volcano/heimser_hut_0
index 9cca27188..cc571dcd0 100644
--- a/wolfsburg/volcano/heimser_hut_0
+++ b/wolfsburg/volcano/heimser_hut_0
@@ -9,7 +9,7 @@ enter_y 7
 msg
 Created:  2008-01-12 lauwenmark
 Based on an original map of Tero Haatanen.
-Modified: 2012-01-24 Rick Tanner
+Modified: 2012-05-20 Nicolas Weeger
 endmsg
 maplore
 This map is part of the Quest of the Two Heimser Brothers.
@@ -342,6 +342,9 @@ I'm Heinkel Heimser.  What do you want from an old man like me? *sigh*
 endmsg
 x 5
 y 4
+arch npc_dialog
+name /wolfsburg/volcano/heimser.msg
+end
 end
 arch dirtfloor
 x 5
diff --git a/wolfsburg/volcano/heimser_hut_1 b/wolfsburg/volcano/heimser_hut_1
index a716fde49..e79603be2 100644
--- a/wolfsburg/volcano/heimser_hut_1
+++ b/wolfsburg/volcano/heimser_hut_1
@@ -9,7 +9,7 @@ enter_x 2
 enter_y 1
 msg
 Created:  2008-01-12 lauwenmark
-Modified: 2011-10-10 Rick Tanner
+Modified: 2012-05-20 Nicolas Weeger
 endmsg
 maplore
 This map is part of the Quest of the Two Heimser Brothers.
@@ -217,6 +217,9 @@ hp 9
 sp 1
 x 4
 y 5
+arch quest_advance_apply
+name wolfsburg/Heimser 0>10
+end
 end
 arch dirtfloor
 x 4
diff --git a/wolfsburg/wolfsburg.quests b/wolfsburg/wolfsburg.quests
index 0338701a3..35d51e74f 100644
--- a/wolfsburg/wolfsburg.quests
+++ b/wolfsburg/wolfsburg.quests
@@ -32,3 +32,37 @@ end_description
 end_step
 end_quest
 
+quest wolfsburg/Heimser
+title Heimser's experiments
+face cauldron.111
+description
+Heimser is making experiments related to magical crystals.
+end_description
+step 10
+description
+Heimser seems to have a laboratory hidden in his hut, I should ask him what this is about.
+end_description
+end_step
+step 20
+description
+Heimser needs 10 mithril crystals for some recipe.
+end_description
+end_step
+step 30
+description
+I brought back the crystals, but Heimser doesn't remember if they should be melted or broken, and asked me to go check with his friend Lordil in Navar's university.
+end_description
+end_step
+step 40
+description
+I have Lordil's reply, I should tell it to Heimser.
+end_description
+end_step
+step 50
+finishes_quest
+description
+Heimser rewarded me.
+end_description
+end_step
+end_quest
+