diff --git a/docker-compose.yml b/docker-compose.yml
index bab5c04da7c8..7fc1a9f81e05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,3 +19,20 @@ rocketchat:
     - mongo:mongo
   ports:
     - 3000:3000
+
+# hubot, the popular chatbot (add the bot user first and change the password before starting this image)
+hubot:
+  image: rocketchat/hubot-rocketchat
+  environment:
+    - ROCKETCHAT_URL=yourhost:3000
+    - ROCKETCHAT_ROOM=GENERAL
+    - ROCKETCHAT_USER=bot
+    - ROCKETCHAT_PASSWORD=botpassword
+    - BOT_NAME=bot
+# you can add more scripts as you'd like here, they need to be installable by npm
+    - EXTERNAL_SCRIPTS=hubot-help,hubot-seen,hubot-links,hubot-diagnostics
+  links:
+    - rocketchat:rocketchat
+# this is used to expose the hubot port for notifications on the host on port 3001, e.g. for hubot-jenkins-notifier
+  ports:
+    - 3001:8080
\ No newline at end of file