diff --git a/dungeons/grukks/grukks.4 b/dungeons/grukks/grukks.4
index e7abefa3e..d312f5e3e 100644
--- a/dungeons/grukks/grukks.4
+++ b/dungeons/grukks/grukks.4
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  1996-09-30
-Modified: 2008-10-21 Rick Tanner
+Modified: 2012-01-01 Nicolas Weeger
 endmsg
 end
 arch flagstone
@@ -1339,6 +1339,9 @@ maxhp 1000
 x 8
 y 2
 speed -0.200000
+arch quest_advance_death
+name navar/grukk 10-20>30
+end
 end
 arch flagstone
 x 8
diff --git a/navar_city/navar_city.quests b/navar_city/navar_city.quests
new file mode 100644
index 000000000..1ef5981a3
--- /dev/null
+++ b/navar_city/navar_city.quests
@@ -0,0 +1,23 @@
+quest navar/grukk
+title Grukk's Tower
+description
+Find Grukk's tower, and reclaim his treasure.
+end_description
+step 10
+description
+You've heard the story of Grukk, who fled Navar with some treasure and built a tower somewhere in the south-est, near the coast.
+end_description
+end_step
+step 20
+description
+You've found Grukk's tower.
+end_description
+end_step
+step 30
+finishes_quest
+description
+You defeated Grukk.
+end_description
+end_step
+end_quest
+
diff --git a/world.quests b/world.quests
index 21c13b86c..c1a48d59a 100644
--- a/world.quests
+++ b/world.quests
@@ -39,3 +39,6 @@ include darcap/darcap/elemental.quests
 include santo_dominion/santo_dominion.quests
 
 include lake_country/lake_country.quests
+
+include navar_city/navar_city.quests
+
diff --git a/world/world_123_120 b/world/world_123_120
index ef26e9a64..bbb6f722d 100644
--- a/world/world_123_120
+++ b/world/world_123_120
@@ -3,7 +3,7 @@ name world_123_120
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2012-01-01 Nicolas Weeger
 endmsg
 outdoor 1
 tile_path_1 world_123_119
@@ -9674,6 +9674,9 @@ hp 12
 sp 12
 x 33
 y 6
+arch quest_advance_apply
+name navar/grukk 10>20
+end
 end
 arch grass
 x 33