diff --git a/inn_and_outpost/hermes_inn b/inn_and_outpost/hermes_inn
index 87cc5d084..b6c3f7541 100644
--- a/inn_and_outpost/hermes_inn
+++ b/inn_and_outpost/hermes_inn
@@ -7,6 +7,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2002-10-27 Todd Mitchell
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -309,12 +310,15 @@ end
 arch fatman
 name Hermes
 msg
-@match hello|Hello
+@match hi|hello
+@question room Do you have a room for the night?
 Greetings, welcome to my inn.
 You must be cold and tired.
-@match room|Room|bed|Bed
+@match room|bed
+@question 50 Fifty goldcoins!?
 Need a room eh? Upstairs, cost ya 50 gold for one day.
-@match 50|fifty|Fifty
+@match 50|fifty
+@reply ripoff You are ripping me off!
 Not much else around friend.
 @match ripoff|cheat|robbery
 You could always go sleep with the bears...
@@ -327,6 +331,7 @@ Who?  Never heard of him.
 @match White|white
 Look. I'm getting tired of all your questions...understand me?
 @match *
+@question room Do you have a room for the night?
 What can I gettcha?
 endmsg
 x 3
@@ -744,6 +749,12 @@ arch woodfloor2
 x 7
 y 8
 end
+arch button_small
+x 7
+y 9
+invisible 1
+connected 1
+end
 arch woodfloor2
 x 7
 y 9
diff --git a/inn_and_outpost/hermes_inn2 b/inn_and_outpost/hermes_inn2
index be43159ad..405c79cf9 100644
--- a/inn_and_outpost/hermes_inn2
+++ b/inn_and_outpost/hermes_inn2
@@ -5,6 +5,7 @@ width 22
 height 10
 msg
 Created:  2002-10-27 Todd Mitchell
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -148,6 +149,12 @@ arch woodfloor2
 x 2
 y 2
 end
+arch button_small
+x 2
+y 3
+invisible 1
+connected 1
+end
 arch woodfloor2
 x 2
 y 3
@@ -177,6 +184,12 @@ arch woodfloor2
 x 2
 y 5
 end
+arch button_small
+x 2
+y 6
+invisible 1
+connected 4
+end
 arch woodfloor2
 x 2
 y 6
@@ -438,6 +451,12 @@ arch woodfloor2
 x 6
 y 2
 end
+arch button_small
+x 6
+y 3
+invisible 1
+connected 2
+end
 arch woodfloor2
 x 6
 y 3
@@ -467,6 +486,12 @@ arch woodfloor2
 x 6
 y 5
 end
+arch button_small
+x 6
+y 6
+invisible 1
+connected 5
+end
 arch woodfloor2
 x 6
 y 6
@@ -720,6 +745,12 @@ arch woodfloor2
 x 10
 y 2
 end
+arch button_small
+x 10
+y 3
+invisible 1
+connected 3
+end
 arch woodfloor2
 x 10
 y 3
@@ -749,6 +780,12 @@ arch woodfloor2
 x 10
 y 5
 end
+arch button_small
+x 10
+y 6
+invisible 1
+connected 6
+end
 arch woodfloor2
 x 10
 y 6
@@ -1042,6 +1079,12 @@ arch woodfloor2
 x 14
 y 5
 end
+arch button_small
+x 14
+y 6
+invisible 1
+connected 7
+end
 arch woodfloor2
 x 14
 y 6