diff --git a/santo_dominion/magara/well/top b/santo_dominion/magara/well/top
index 78df96bd8..4110c3c89 100644
--- a/santo_dominion/magara/well/top
+++ b/santo_dominion/magara/well/top
@@ -9,7 +9,7 @@ enter_x 15
 enter_y 14
 msg
 Created:  2002-08-23 Andreas Vogl
-Modified: 2012-01-06 Rick Tanner
+Modified: 2013-02-10 Nicolas Weeger
 endmsg
 end
 arch cave_15
@@ -718,6 +718,9 @@ hp 34
 sp 2
 x 4
 y 19
+arch quest_advance_apply
+name santo_dominion/well 10>20
+end
 end
 arch pstone_1
 x 4
diff --git a/santo_dominion/magara/well/treasure b/santo_dominion/magara/well/treasure
index d514cf62d..4701d7d66 100644
--- a/santo_dominion/magara/well/treasure
+++ b/santo_dominion/magara/well/treasure
@@ -8,7 +8,7 @@ enter_x 8
 enter_y 2
 msg
 Created:  2002-08-23 Andreas Vogl
-Modified: 2008-10-27 Rick Tanner
+Modified: 2013-02-10 Nicolas Weeger
 endmsg
 end
 arch blocked
@@ -1546,6 +1546,14 @@ x 8
 y 19
 connected 1
 end
+arch magic_mouth
+msg
+You see a weird bee making a really strange noise, which kind of resonates in your bones. This is probably what the innkeeper is complaining about.
+endmsg
+food 1
+x 8
+y 19
+end
 arch flagstone
 x 8
 y 19
@@ -1554,6 +1562,21 @@ arch random_talisman
 x 8
 y 19
 end
+arch darkgreen_key
+name strange bee
+name_pl strange bees
+race none
+slaying quest_item_santo_dominion_well
+face bee.111
+x 8
+y 19
+arch quest_advance_pickup
+name santo_dominion/well 20>30
+end
+arch quest_prevent_drop
+name santo_dominion/well 40
+end
+end
 arch flagstone
 x 8
 y 20
diff --git a/santo_dominion/noble_rest b/santo_dominion/noble_rest
index 56e198dfc..4052355fb 100644
--- a/santo_dominion/noble_rest
+++ b/santo_dominion/noble_rest
@@ -7,7 +7,7 @@ height 22
 enter_x 10
 enter_y 18
 msg
-Modified: 2012-03-25 Rick Tanner
+Modified: 2013-02-10 Nicolas Weeger
 endmsg
 outdoor 1
 end
@@ -2111,6 +2111,9 @@ endmsg
 Wis 3
 x 12
 y 14
+arch npc_dialog
+name /santo_dominion/noble_rest.msg
+end
 end
 arch dungeon_magic
 x 12
diff --git a/santo_dominion/noble_rest.msg b/santo_dominion/noble_rest.msg
new file mode 100644
index 000000000..c524705ac
--- /dev/null
+++ b/santo_dominion/noble_rest.msg
@@ -0,0 +1,77 @@
+{
+  "rules": [
+  {
+  "match" : ["hi", "hello"],
+  "pre" : [["quest", "santo_dominion/well", "=0"]],
+  "post" : [["setnpctoken", "state", "ask"]],
+  "msg" : ["Welcome to The Noble Resting.  A fine place to sleep and dine.\n\nSay, you seem a decent fellow, could I ask you something?"],
+  "replies" : [["yes", "Yes, what is it?", "1"], ["no", "No, sorry.", "0"]]
+  }, {
+  "match" : ["no"],
+  "pre" : [["npctoken", "state", "ask"]],
+  "post" : [["setnpctoken", "state", "0"]],
+  "msg" : ["Sorry for bothering you."]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["npctoken", "state", "ask"]],
+  "post" : [["setnpctoken", "state", "propose"]],
+  "msg" : ["Well, actually... there is a weird noise coming from the well nearby.\n\nDo you think you could investigate?"],
+  "replies" : [["sure", "Of course, count on me!", "1"], ["nope", "Sorry, but I'm just too busy lately.", "1"]]
+  }, {
+  "match" : ["sure"],
+  "pre" : [["npctoken", "state", "propose"]],
+  "post" : [["quest", "santo_dominion/well", "10"], ["setnpctoken", "state", "0"]],
+  "msg" : ["Oh, thank you very much!"]
+  }, {
+  "match" : ["nope"],
+  "pre" : [["npctoken", "state", "propose"]],
+  "post" : [["setnpctoken", "state", "0"]],
+  "msg" : ["Well, it was worth asking..."]
+  }, {
+  "match" : ["hi", "hello"],
+  "pre" : [["quest", "santo_dominion/well", "10-30"]],
+  "post" : [["setnpctoken", "state", "found"]],
+  "msg" : ["Welcome to The Noble Resting.  A fine place to sleep and dine.\n\nSo, did you find the origin of the noise?"],
+  "replies" : [["yes", "Yes, I did.", "1"], ["no", "No, not yet.", "1"]]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "santo_dominion/well", "=30"], ["item", "quest_item_santo_dominion_well"], ["npctoken", "state", "found"]],
+  "post" : [["quest", "santo_dominion/well", "40"], ["takeitem", "quest_item_santo_dominion_well"]],
+  "msg" : ["Oh, thank you very much! Bad bee, making all that noise.\n\nGive it to me, I'll punish it..."]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["npctoken", "state", "found"]],
+  "post" : [["setnpctoken", "state", "0"]],
+  "msg" : ["So what was it?"]
+  }, {
+  "match" : ["no"],
+  "pre" : [["npctoken", "state", "found"]],
+  "post" : [["setnpctoken", "state", "0"]],
+  "msg" : ["Well, if you have time, please keep on searching..."]
+  }, {
+  "match" : ["hi", "hello"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Welcome to The Noble Resting.  A fine place to sleep and dine."]
+  }, {
+  "match" : ["room", "rest", "inn", "sleep"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["We have rooms available up ahead and around the corner.  Stay as long as you like."]
+  }, {
+  "match" : ["food", "meal", "eat", "dine"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["You just missed our serving hour.  Perhaps there is a small meal still available."]
+  }, {
+  "match" : ["stairs", "upstairs"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Our second floor has additional guest rooms and two rooftop decks for relaxing."]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Well good day to you!"]
+  }
+]}
diff --git a/santo_dominion/santo_dominion.quests b/santo_dominion/santo_dominion.quests
index 1eb4d8907..8794e1d87 100644
--- a/santo_dominion/santo_dominion.quests
+++ b/santo_dominion/santo_dominion.quests
@@ -61,3 +61,32 @@ end_description
 end_step
 end_quest
 
+quest santo_dominion/well
+title Santo Dominion's noisy well
+face well.111
+description
+The Noble Resting's innkeeper asked me to find the source of a strange noise in the well nearby.
+end_description
+step 10
+description
+I should go explore the well.
+end_description
+end_step
+step 20
+description
+I found a suspicious hole which I should explore.
+end_description
+end_step
+step 30
+description
+I found the source of the noise, and should bring it back to the innkeeper.
+end_description
+end_step
+step 40
+finishes_quest
+description
+The innkeeper is happy, the clients of the Noble Resting can now enjoy some calm.
+end_description
+end_step
+end_quest
+