diff --git a/kibana/Dockerfile b/kibana/Dockerfile
new file mode 100644
index 00000000..f78c177b
--- /dev/null
+++ b/kibana/Dockerfile
@@ -0,0 +1,22 @@
+FROM itzg/ubuntu-openjdk-7
+
+MAINTAINER itzg
+
+ENV KIBANA_VERSION 4.0.1
+
+RUN wget -q -O /tmp/kibana.tgz https://download.elasticsearch.org/kibana/kibana/kibana-4.0.1-linux-x64.tar.gz
+
+RUN tar -C /opt -xzf /tmp/kibana.tgz && rm /tmp/kibana.tgz
+ENV KIBANA_HOME /opt/kibana-$KIBANA_VERSION-linux-x64
+
+# Simplify for cross-container
+ENV ES_URL http://es:9200
+
+WORKDIR $KIBANA_HOME
+
+ADD start.sh /start
+
+EXPOSE 5601
+
+CMD ["/start"] 
+
diff --git a/kibana/README.md b/kibana/README.md
new file mode 100644
index 00000000..9009197f
--- /dev/null
+++ b/kibana/README.md
@@ -0,0 +1,26 @@
+
+Provides a ready-to-run [Kibana](http://www.elasticsearch.org/overview/kibana/) server that can
+easily hook into your [Elasticsearch containers](https://registry.hub.docker.com/u/itzg/elasticsearch/).
+
+## Usage with Docker elasticsearch container
+
+This is by far the easiest and most Docker'ish way to run Kibana.
+
+Assuming you started one or more containers using something like
+
+    docker run -d --name your-es -p 9200:9200 itzg/elasticsearch
+
+Start Kibana using
+
+    docker run -d -p 5601:5601 --link your-es:es itzg/kibana
+
+Proceed to use Kibana starting from 
+[this point in the documentation](http://www.elasticsearch.org/guide/en/kibana/current/access.html)
+
+## Usage with non-Docker elasticsearch
+
+Start Kibana using
+
+    docker run -d -p 5601:5601 -e ES_URL=http://YOUR_ES:9200 itzg/kibana
+
+Replacing `http://YOUR_ES:9200` with the appropriate URL for your system.
diff --git a/kibana/start.sh b/kibana/start.sh
new file mode 100755
index 00000000..e5c41295
--- /dev/null
+++ b/kibana/start.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+OPTS="-e $ES_URL"
+
+exec bin/kibana $OPTS
+