diff --git a/api/bots/feedback-bot b/api/bots/feedback-bot
new file mode 100755
index 0000000000..e4da88344d
--- /dev/null
+++ b/api/bots/feedback-bot
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+import sys
+import os
+import optparse
+
+usage = """feedback-bot [options]
+
+Forwards messages from MIT realm users sent to feedback@humbughq.com over to Humbug realm
+
+Example: feedback-bot --site=http://127.0.0.1:9991
+"""
+parser = optparse.OptionParser(usage=usage)
+parser.add_option('--site',
+                  dest='site',
+                  default="https://app.humbughq.com",
+                  action='store')
+(options, args) = parser.parse_args()
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+import api.common
+client = api.common.HumbugAPI(email="feedback@humbughq.com",
+                              api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+                              verbose=True,
+                              site=options.site)
+
+def forward_message(message):
+    if message["sender_email"].endswith("@mit.edu"):
+        forwarded_message = {
+            "type": "stream",
+            "stream": "support",
+            "subject": "feedback from %s" % message["sender_email"],
+            "content": message["content"],
+            }
+        client.send_message(forwarded_message)
+
+client.call_on_each_message(forward_message)