diff --git a/navar_city/city1court b/navar_city/city1court
index a55440ee1..7c56d3e17 100644
--- a/navar_city/city1court
+++ b/navar_city/city1court
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 16
 msg
 Created:  1993-11-01 (john_cater@yahoo.com)
-Modified: 2012-03-14 Rick Tanner
+Modified: 2012-04-22 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -1672,6 +1672,9 @@ arch warrior_1
 name Staff Sgt. MacDonald
 x 14
 y 11
+arch npc_dialog
+name /navar_city/city1court.msg
+end
 end
 arch cobblestones2
 x 14
diff --git a/navar_city/city1court.msg b/navar_city/city1court.msg
new file mode 100644
index 000000000..e92cbc861
--- /dev/null
+++ b/navar_city/city1court.msg
@@ -0,0 +1,43 @@
+{
+  "location" : "navar",
+  "rules": [
+  {
+  "match" : ["*"],
+  "pre" : [["quest", "quests/TrollCanyon", "30"]],
+  "post" : [],
+  "msg" : ["Thanks for clearing those pesky trolls, now I have more free time."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "quests/TrollCanyon", "10-20"]],
+  "post" : [],
+  "msg" : ["Hello. So, did you clean those pesky trolls?"]
+  }, {
+  "match" : ["sure"],
+  "pre" : [["npctoken", "dialog", "sure"]],
+  "post" : [["quest", "quests/TrollCanyon", "10"]],
+  "msg" : ["Thanks you very much!\n\nMy spies tell me this den is situated south-west of Navar, close to the mountains.\n\nFrom the Navar-Scorn road, take the dirt road leading to the Training Center, and search the valley south of it."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["npctoken", "dialog", "sure"]],
+  "post" : [["setnpctoken", "dialog", "(empty)"]],
+  "msg" : ["Ah well, I knew it was too much to hope for..."]
+  }, {
+  "match" : ["go"],
+  "pre" : [["npctoken", "dialog", "go"]],
+  "post" : [["setnpctoken", "dialog", "sure"]],
+  "msg" : ["Really? That would be very nice. Are you sure?"],
+  "replies" : [["sure", "Yes, I feel like having some fun with trolls.", "1"], ["no", "Well, no.", "1"]]
+  }, {
+  "match" : ["busy"],
+  "pre" : [["npctoken", "dialog", "trolls"]],
+  "post" : [["setnpctoken", "dialog", "go"]],
+  "msg" : ["Well, trolls are said to be building some fortress in the mountains, and planning some evil.\n\nUnfortunately I don't have enough troops to go teach them a lesson."],
+  "replies" : [["go", "So should I go do that for you?", "2"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [["setnpctoken", "dialog", "trolls"]],
+  "msg" : ["Hello.\n\nSorry, but I'm kind of busy."],
+  "replies" : [["busy", "Why are you busy?", "2"]]
+  }
+]}
diff --git a/navar_city/navar_city.quests b/navar_city/navar_city.quests
index 2fc6c496a..397daabec 100644
--- a/navar_city/navar_city.quests
+++ b/navar_city/navar_city.quests
@@ -22,3 +22,32 @@ end_description
 end_step
 end_quest
 
+quest quests/TrollCanyon
+title Troll Canyon
+face gaelotroll.x31
+description
+I've agreed to go fight some trolls who are building some den in the mountains for Sgt. MacDonald who doesn't have enough troops.
+end_description
+step 10
+description
+I'm searching the entrance of the troll's den. It is situated south-west of Navar, close to the mountains. From the Navar-Scorn road, I should take the dirt road leading to the Training Center, and search the valley south of it.
+end_description
+end_step
+step 20
+description
+I've found the entrance of the troll canyon.
+end_description
+end_step
+step 30
+description
+I've killed the chief, now I should claim the treasure he surely has.
+end_description
+end_step
+step 40
+finishes_quest
+description
+I've found the treasure of the troll canyon.
+end_description
+end_step
+end_quest
+
diff --git a/navar_city/troll_canyon/troll_canyon.1 b/navar_city/troll_canyon/troll_canyon.1
index 08f8dcc6a..3ac2b603d 100755
--- a/navar_city/troll_canyon/troll_canyon.1
+++ b/navar_city/troll_canyon/troll_canyon.1
@@ -7,7 +7,7 @@ height 32
 enter_y 26
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2012-02-19 Rick Tanner
+Modified: 2012-04-22 Nicolas Weeger
 endmsg
 tile_path_4 troll_canyon.0
 end
@@ -3734,6 +3734,9 @@ hp 0
 sp 7
 x 26
 y 14
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -3741,6 +3744,9 @@ hp 0
 sp 8
 x 26
 y 15
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -3748,6 +3754,9 @@ hp 0
 sp 9
 x 26
 y 16
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain
 x 26
@@ -3878,6 +3887,9 @@ hp 0
 sp 7
 x 27
 y 14
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -3885,6 +3897,9 @@ hp 0
 sp 8
 x 27
 y 15
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -3892,6 +3907,9 @@ hp 0
 sp 9
 x 27
 y 16
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain
 x 27
@@ -4014,6 +4032,9 @@ hp 0
 sp 7
 x 28
 y 14
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -4021,6 +4042,9 @@ hp 0
 sp 8
 x 28
 y 15
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain_cave
 slaying troll_canyon.2
@@ -4028,6 +4052,9 @@ hp 0
 sp 9
 x 28
 y 16
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain
 x 28
@@ -4154,6 +4181,9 @@ hp 0
 sp 8
 x 29
 y 15
+arch quest_advance_apply
+name quests/TrollCanyon 10>20
+end
 end
 arch mountain
 x 29
diff --git a/navar_city/troll_canyon/troll_canyon.7 b/navar_city/troll_canyon/troll_canyon.7
index e123f5ab4..812f15e33 100755
--- a/navar_city/troll_canyon/troll_canyon.7
+++ b/navar_city/troll_canyon/troll_canyon.7
@@ -8,7 +8,7 @@ enter_x 19
 enter_y 2
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2012-04-22 Nicolas Weeger
 endmsg
 tile_path_1 troll_canyon.8
 tile_path_2 troll_canyon.6
@@ -1049,6 +1049,9 @@ wc -4
 level 14
 attacktype 65
 end
+arch quest_advance_death
+name quests/TrollCanyon 0-20>30
+end
 end
 arch pstone_2
 x 10
@@ -1102,6 +1105,10 @@ material 2064
 value 200
 weight 45000
 magic 2
+arch quest_advance_pickup
+name quests/TrollCanyon 0-30>40
+unique 1
+end
 end
 arch pstone_2
 x 10