diff --git a/port_joseph/pirates/fortvsship b/port_joseph/pirates/fortvsship
index 78f1cbff0..8dd202a3c 100644
--- a/port_joseph/pirates/fortvsship
+++ b/port_joseph/pirates/fortvsship
@@ -8,7 +8,7 @@ enter_x 3
 enter_y 27
 msg
 Created:  1994-05-27 langley (langley@fermat.dartmouth.edu)
-Modified: 2012-02-20 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -729,6 +729,9 @@ type 41
 connected 7
 activate_on_push 1
 activate_on_release 1
+arch npc_dialog
+name /port_joseph/pirates/rowboat.msg
+end
 end
 arch sea
 x 3
@@ -738,6 +741,15 @@ arch sea
 x 3
 y 29
 end
+arch magic_ear
+msg
+@match tortola
+Aye!  Tortola it is!
+endmsg
+x 3
+y 29
+connected 7
+end
 arch cobblestones2
 x 4
 end
@@ -919,15 +931,6 @@ arch pstone_1
 x 4
 y 26
 end
-arch magic_ear
-msg
-@match tortola
-Aye!  Tortola it is!
-endmsg
-x 4
-y 27
-connected 7
-end
 arch magic_mouth
 msg
 Have ye the name of the treasure island?
diff --git a/port_joseph/pirates/mooglyprize b/port_joseph/pirates/mooglyprize
index a736928a7..d1926ee48 100644
--- a/port_joseph/pirates/mooglyprize
+++ b/port_joseph/pirates/mooglyprize
@@ -9,7 +9,7 @@ enter_x 7
 enter_y 14
 msg
 Created:  1994-06-11 langley (langley@fermat.dartmouth.edu)
-Modified: 2012-02-21 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 end
 arch dungeon_floor
@@ -807,6 +807,10 @@ x 7
 y 1
 value 1000
 weight 20000
+arch quest_advance_pickup
+name port_joseph/MooglyBill 0-60>70
+unique 1
+end
 end
 arch dungeon_floor
 x 7
diff --git a/port_joseph/pirates/rowboat.msg b/port_joseph/pirates/rowboat.msg
new file mode 100644
index 000000000..2c7bb4e19
--- /dev/null
+++ b/port_joseph/pirates/rowboat.msg
@@ -0,0 +1,9 @@
+{
+  "rules": [
+  {
+  "match" : ["tortola"],
+  "pre" : [["quest", "port_joseph/MooglyBill", "0-40"]],
+  "post" : [["quest", "port_joseph/MooglyBill", "50"]],
+  "msg" : [""]
+  }
+]}
diff --git a/port_joseph/pirates/tortcave b/port_joseph/pirates/tortcave
index aac2c8d51..034797e6d 100644
--- a/port_joseph/pirates/tortcave
+++ b/port_joseph/pirates/tortcave
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 4
 msg
 Created:  1994-06-11 larry langley (langley@fermat.dartmouth.edu)
-Modified: 2012-02-21 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 end
 arch dun33
@@ -183,6 +183,9 @@ hp 5
 sp 7
 x 3
 y 1
+arch quest_advance_apply
+name port_joseph/MooglyBill 0-50>60
+end
 end
 arch dungeon_floor
 x 3
diff --git a/port_joseph/port_joseph.quests b/port_joseph/port_joseph.quests
new file mode 100644
index 000000000..9112b6e35
--- /dev/null
+++ b/port_joseph/port_joseph.quests
@@ -0,0 +1,44 @@
+quest port_joseph/MooglyBill
+title Moogly Bill's treasure
+face pirate.111
+description
+I've heard of Moogly Bill, a pirate, who hide his treasure somewhere.
+end_description
+step 10
+description
+I should talk to Redeye, who has more information.
+end_description
+end_step
+step 20
+description
+Percival knows things about Moogly Bill, but I should talk to Portia first.
+end_description
+end_step
+step 30
+description
+I should talk to Percival, and mention 'violet'.
+end_description
+end_step
+step 40
+description
+I must find Moogly Bill's grave, and the name of the treasure island.
+end_description
+end_step
+step 50
+description
+I should explore the island.
+end_description
+end_step
+step 60
+description
+I've reached the entrance to Moogly Bill's treasure.
+end_description
+end_step
+step 70
+finishes_quest
+description
+I've claimed Moogly Bill's treasure.
+end_description
+end_step
+end_quest
+
diff --git a/port_joseph/town/dshark b/port_joseph/town/dshark
index a3e4345cd..474fa8af5 100644
--- a/port_joseph/town/dshark
+++ b/port_joseph/town/dshark
@@ -8,7 +8,7 @@ enter_x 16
 enter_y 6
 msg
 Created:  1994-05-17 langley (langley@fermat.dartmouth.edu)
-Modified: 2012-02-21 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 outdoor 1
 end
@@ -1644,6 +1644,9 @@ endmsg
 x 14
 y 6
 unaggressive 1
+arch npc_dialog
+name /port_joseph/town/dshark_redeye.msg
+end
 end
 arch woodfloor
 x 14
@@ -2080,6 +2083,9 @@ endmsg
 x 17
 y 15
 unaggressive 1
+arch npc_dialog
+name /port_joseph/town/dshark_thief.msg
+end
 end
 arch woodfloor
 x 17
diff --git a/port_joseph/town/dshark_redeye.msg b/port_joseph/town/dshark_redeye.msg
new file mode 100644
index 000000000..d845d0064
--- /dev/null
+++ b/port_joseph/town/dshark_redeye.msg
@@ -0,0 +1,9 @@
+{
+  "rules": [
+  {
+  "match" : ["portia", "lady"],
+  "pre" : [["quest", "port_joseph/MooglyBill", "0-20"]],
+  "post" : [["quest", "port_joseph/MooglyBill", "20"]],
+  "msg" : ["Eh, a pretty lass in her day.  Ask her about Percy, not me.  She has a house up near the church."]
+  }
+]}
diff --git a/port_joseph/town/dshark_thief.msg b/port_joseph/town/dshark_thief.msg
new file mode 100644
index 000000000..7e60e9361
--- /dev/null
+++ b/port_joseph/town/dshark_thief.msg
@@ -0,0 +1,9 @@
+{
+  "rules": [
+  {
+  "match" : ["redeye"],
+  "pre" : [["quest", "port_joseph/MooglyBill", "=0"]],
+  "post" : [["quest", "port_joseph/MooglyBill", "10"]],
+  "msg" : ["Redeye is in the back room watching the fight.  He's the ugly one."]
+  }
+]}
diff --git a/port_joseph/town/percival.msg b/port_joseph/town/percival.msg
new file mode 100644
index 000000000..b37e633c8
--- /dev/null
+++ b/port_joseph/town/percival.msg
@@ -0,0 +1,9 @@
+{
+  "rules": [
+  {
+  "match" : ["violet"],
+  "pre" : [["quest", "port_joseph/MooglyBill", "0-30"]],
+  "post" : [["quest", "port_joseph/MooglyBill", "40"]],
+  "msg" : ["Ah so Portia sent ye. . .'\nThe king's navy is attacking the fort!  This is as far as I dare take ye.\nThe grave is under the shadow of the wall to the north.  Return with the name of the island where he buried his treasure . . ."]
+  }
+]}
diff --git a/port_joseph/town/portia.msg b/port_joseph/town/portia.msg
new file mode 100644
index 000000000..0b9fcf793
--- /dev/null
+++ b/port_joseph/town/portia.msg
@@ -0,0 +1,9 @@
+{
+  "rules": [
+  {
+  "match" : ["percival", "percy"],
+  "pre" : [["quest", "port_joseph/MooglyBill", "0-20"]],
+  "post" : [["quest", "port_joseph/MooglyBill", "30"]],
+  "msg" : ["Ah Percy!  Being stubborn is he? Well, he and I are old friends.  Yes, just mention `violet' and he'll know who sent you."]
+  }
+]}
diff --git a/port_joseph/town/portia2 b/port_joseph/town/portia2
index 5aaeb9db3..b8e1d1bad 100644
--- a/port_joseph/town/portia2
+++ b/port_joseph/town/portia2
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 5
 msg
 Created:  1994-05-26 langley
-Modified: 2012-02-21 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -2138,6 +2138,9 @@ randomitems none
 arch spell_magic_bullet
 end
 end
+arch npc_dialog
+name /port_joseph/town/portia.msg
+end
 end
 arch woodfloor
 x 23
diff --git a/world.quests b/world.quests
index c1900afeb..42bebfe8d 100644
--- a/world.quests
+++ b/world.quests
@@ -47,3 +47,5 @@ include quests/quests.quests
 include brest/brest.quests
 include euthville/euthville.quests
 
+include port_joseph/port_joseph.quests
+
diff --git a/world/world_101_114 b/world/world_101_114
index abc311b9b..69b48eaa0 100644
--- a/world/world_101_114
+++ b/world/world_101_114
@@ -4,7 +4,7 @@ region portjoseph
 width 50
 height 50
 msg
-Modified: 2012-05-23 Rick Tanner
+Modified: 2012-06-15 Nicolas Weeger
 endmsg
 outdoor 1
 tile_path_1 world_101_113
@@ -3742,6 +3742,9 @@ endmsg
 x 15
 y 46
 unaggressive 1
+arch npc_dialog
+name /port_joseph/town/percival.msg
+end
 end
 arch rowboat
 slaying /port_joseph/pirates/fortvsship
@@ -3762,6 +3765,17 @@ arch sea
 x 15
 y 48
 end
+arch magic_ear
+msg
+@match violet
+Percival says 'Ah so Portia sent ye. . .'
+The king's navy is attacking the fort!  This is as far as I dare take ye.
+The grave is under the shadow of the wall to the north.  Return with the name of the island where he buried his treasure . . .
+endmsg
+x 15
+y 48
+connected 2
+end
 arch sea
 x 15
 y 49
@@ -4011,17 +4025,6 @@ arch pier_1_2
 x 16
 y 45
 end
-arch magic_ear
-msg
-@match violet
-Percival says `Ah so Portia sent ye. . .'
-The king's navy is attacking the fort!  This is as far as I dare take ye.
-The grave is under the shadow of the wall to the north.  Return with the name of the island where he buried his treasure . . .
-endmsg
-x 16
-y 46
-connected 2
-end
 arch phole_1
 name sea
 slaying /world/world_100_114