diff --git a/asmodee.py b/asmodee.py
index 33ffb93..1e97929 100755
--- a/asmodee.py
+++ b/asmodee.py
@@ -1138,7 +1138,7 @@ def biere(room,event):
 			# tous les breuvages de tous les salons
 			reponse = "Les breuvages de tous les salons : " + "\n"
 			salon.send_text(reponse)
-			for rid,fame in biere.items():
+			for rid,fame in bieres.items():
 				reponse = "Voici les reponses du salon " + rid + "\n"
 				for cle,valeur in fame.items():
 					reponse = reponse + cle[0] + " / " + str(cle[1]) + " : " + valeur + "\n"
@@ -1232,6 +1232,18 @@ def accueil(room,event):
 	else:
 		salon.send_text("Vous n'êtes pas autorisés à modifier le message d'accueil.")
 		
+def bienvenue(room,event):
+	membership = event['content']['membership']
+	nick = getNick(room,event)
+	alias = ""
+	if (len(room.aliases) > 0):
+		alias = room.aliases[0]
+	msg = ""
+	if (len(welcome[room.room_id]) > 0):
+		msg = welcome[room.room_id]
+	if (membership == "join"):
+		room.send_text("Bienvenue sur " + alias + ", " + nick + ". " + msg)
+
 def invitations(room_id, state):
 	global bot
 	try:
@@ -1338,6 +1350,7 @@ def main():
 	membres_read()
 	welcome_handler = MCommandHandler("accueil", accueil)
 	bot.add_handler(welcome_handler)
+	bot.client.add_listener(bienvenue, event_type="m.room.member")
 
 	#test_handler = MCommandHandler("test", verifPMRoom)
 	#bot.add_handler(test_handler)