diff --git a/modules/greeting.py b/modules/greeting.py
new file mode 100644
index 00000000..45ba0b7b
--- /dev/null
+++ b/modules/greeting.py
@@ -0,0 +1,13 @@
+
+
+class Module(object):
+    def __init__(self, bot, events, exports):
+        events.on("received.join").hook(self.join)
+        exports.add("channelset", {"setting": "greeting",
+            "help": "Set a greeting to send to users when they join"})
+
+    def join(self, event):
+        greeting = event["channel"].get_setting("greeting", None)
+        if greeting:
+            event["user"].send_notice("[%s] %s" % (event["channel"].name,
+                greeting))