diff --git a/kibana4/Dockerfile b/kibana4/Dockerfile
new file mode 100644
index 0000000..3ef42c6
--- /dev/null
+++ b/kibana4/Dockerfile
@@ -0,0 +1,14 @@
+FROM dockerfile/java:openjdk-7-jre
+
+ENV KIBANA_VERSION 4.0.0-beta3
+ENV ELASTICSEARCH_URL http://localhost:9200
+
+## Install Kibana
+RUN wget -q -O - https://download.elasticsearch.org/kibana/kibana/kibana-$KIBANA_VERSION.tar.gz \
+    | tar -C /usr/local/ -xzf -
+
+EXPOSE 5601
+
+#CMD /usr/local/kibana-$KIBANA_VERSION/bin/kibana
+ADD run.sh /run.sh
+CMD ["/run.sh"]
diff --git a/kibana4/run.sh b/kibana4/run.sh
new file mode 100755
index 0000000..60ff2cb
--- /dev/null
+++ b/kibana4/run.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sed -E \
+    -e "s|elasticsearch:.+|elasticsearch: \"$ELASTICSEARCH_URL\"|" \
+    -i /usr/local/kibana-$KIBANA_VERSION/config/kibana.yml
+
+/usr/local/kibana-$KIBANA_VERSION/bin/kibana