diff --git a/kibana4/Dockerfile b/kibana4/Dockerfile
new file mode 100644
index 0000000..725fe4a
--- /dev/null
+++ b/kibana4/Dockerfile
@@ -0,0 +1,26 @@
+FROM debian:jessie
+
+MAINTAINER Ric Lister, rlister@gmail.com
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
+    openjdk-7-jre-headless \
+    wget
+
+WORKDIR /app
+
+ENV KIBANA_VERSION 4.0.0-BETA2
+
+RUN cd /tmp && \
+    wget -q https://download.elasticsearch.org/kibana/kibana/kibana-${KIBANA_VERSION}.tar.gz && \
+    tar zxf /tmp/kibana-${KIBANA_VERSION}.tar.gz -C /app --strip-components=1 && \
+    rm -f /tmp/kibana-${KIBANA_VERSION}.tar.gz
+
+EXPOSE 5601
+
+## sub env vars into config file
+ADD config.sh /app/
+ENTRYPOINT [ "sh", "./config.sh" ]
+
+CMD [ "bin/kibana" ]
diff --git a/kibana4/config.sh b/kibana4/config.sh
new file mode 100644
index 0000000..51d2d03
--- /dev/null
+++ b/kibana4/config.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+## substitute values in config file if any of these env vars are set
+[ -z "$PORT" ]            || sed -ri "s|^(port):.*|\1: ${PORT}|"                       config/kibana.yml
+[ -z "$HOST" ]            || sed -ri "s|^(host):.*|\1: \"${HOST}\"|"                   config/kibana.yml
+[ -z "$ELASTICSEARCH" ]   || sed -ri "s|^(elasticsearch):.*|\1: \"${ELASTICSEARCH}\"|" config/kibana.yml
+[ -z "$KIBANAINDEX" ]     || sed -ri "s|^(kibanaIndex):.*|\1: \"${KIBANAINDEX}\"|"     config/kibana.yml
+[ -z "$DEFAULTAPPID" ]    || sed -ri "s|^(defaultAppId):.*|\1: \"${DEFAULTAPPID}\"|"   config/kibana.yml
+[ -z "$REQUEST_TIMEOUT" ] || sed -ri "s|^(request_timeout):.*|\1: ${REQUEST_TIMEOUT}|" config/kibana.yml
+[ -z "$SHARD_TIMEOUT" ]   || sed -ri "s|^(shard_timeout):.*|\1: ${SHARD_TIMEOUT}|"     config/kibana.yml
+[ -z "$VERIFYSSL" ]       || sed -ri "s|^(verifySSL):.*|\1: ${VERIFYSSL}|"             config/kibana.yml
+
+## run our arguments so we can use this as entrypoint
+[ $# -eq 0 ] || exec $*