diff --git a/riemann/Dockerfile b/riemann/Dockerfile
new file mode 100644
index 0000000..e15a816
--- /dev/null
+++ b/riemann/Dockerfile
@@ -0,0 +1,26 @@
+FROM jeanblanchard/busybox-java
+
+MAINTAINER Ric Lister, rlister@gmail.com
+
+## busybox wget cannot do https, so grab curl binary
+ENV CURL_VERSION 7.30.0
+RUN (wget -O - http://www.magicermine.com/demos/curl/curl/curl-${CURL_VERSION}.ermine.tar.bz2 | bunzip2 -c - | tar xf -) \
+    && mv /curl-${CURL_VERSION}.ermine/curl.ermine /bin/curl \
+    && rm -rf /curl-${CURL_VERSION}.ermine
+
+## install riemann
+ENV RIEMANN_VERSION 0.2.8
+RUN curl -skL https://aphyr.com/riemann/riemann-${RIEMANN_VERSION}.tar.bz2 | bunzip2 | tar -x && \
+    mv /riemann-${RIEMANN_VERSION} /app
+
+WORKDIR /app
+
+## hack shell wrapper to use busybox sh
+RUN sed -ie 's/env bash/env sh/' bin/riemann
+
+## hack default config to listen on all interfaces
+RUN sed -ie 's/127.0.0.1/0.0.0.0/' etc/riemann.config
+
+EXPOSE 5555/tcp 5555/udp 5556
+
+CMD [ "bin/riemann", "etc/riemann.config" ]
diff --git a/riemann/README.md b/riemann/README.md
new file mode 100644
index 0000000..a4d7301
--- /dev/null
+++ b/riemann/README.md
@@ -0,0 +1,25 @@
+# Riemann
+
+[Riemann](http://riemann.io/) monitors distributed systems.
+
+This dockerfile builds an extremely minimalist image for running
+Riemann, based on busybox+java and nothing else.
+
+## Usage
+
+```
+docker run -d -p 5555:5555 -p 5555:5555/udp -p 5556:5556 rlister/riemann
+```
+
+This will run with the default configuration from
+`etc/riemann.config`. Custom config volumes should be mounted on
+`/app/etc`, e.g.:
+
+```
+docker run -d \
+  -p 5555:5555 \
+  -p 5555:5555/udp \
+  -p 5556:5556 \
+  -v $HOME/riemann/etc:/app/etc \
+  rlister/riemann
+```