diff --git a/Dockerfile b/Dockerfile
index d3569e2a..c4469dbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:24
 
 # so we don't have to compile those when fetched from PyPI
-RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client python-m2ext && \
+RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client python-m2ext fedmsg-relay && \
     dnf autoremove -y && dnf clean all && \
     mkdir /opt/module_build_service/
 WORKDIR /opt/module_build_service/
diff --git a/docker-compose.yml b/docker-compose.yml
index a5bdf152..105485b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,19 @@
 version: "2"
 services:
+  fedmsg-relay:
+    build:
+      context: .
+    command: fedmsg-relay
+    ports:
+      - "2003:2003"
+      - "4001:4001"
   module_build_service_daemon:
     build:
       context: .
     command: python2 /opt/module_build_service/module_build_service_daemon.py
+    links:
+      - module_build_service_daemon
+      - fedmsg-relay
     volumes:
       - ./module_build_service/:/opt/module_build_service/module_build_service/:Z  # module_build_service sources are bind-mounted, so you don't have to rebuild
       - ~/.fedora.cert:/root/.fedora.cert:Z   # koji credentials are mounted inside
@@ -16,5 +26,6 @@ services:
       - "5000:5000"
     links:
       - module_build_service_daemon
+      - fedmsg-relay
     volumes:
       - ./module_build_service/:/opt/module_build_service/module_build_service/:Z