diff --git a/contrib/docker/devel/Dockerfile b/contrib/docker/devel/Dockerfile
new file mode 100644
index 00000000..3ecc6e4a
--- /dev/null
+++ b/contrib/docker/devel/Dockerfile
@@ -0,0 +1,37 @@
+FROM debian
+
+RUN apt-get update && apt-get install -y \
+    libmosquitto1 \
+    curl
+
+RUN apt-get update && apt-get install -y \
+    autoconf automake g++ make \
+    libmosquitto-dev
+
+LABEL maintainer "ebusd@ebusd.eu"
+
+ENV EBUSD_VERSION 3.0pre
+ENV EBUSD_ARCH amd64
+
+LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}-devel"
+
+WORKDIR /build
+
+RUN (curl -SL https://github.com/john30/ebusd/archive/master.tar.gz \
+    | tar xz --strip-components=1) \
+    && ./autogen.sh \
+    && make install-strip
+
+WORKDIR /
+
+RUN rm -rf /build
+
+RUN mkdir -p /etc/ebusd \
+    && curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
+    | tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
+
+EXPOSE 8888
+
+COPY docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["-f", "--scanconfig"]
diff --git a/contrib/docker/devel/docker-entrypoint.sh b/contrib/docker/devel/docker-entrypoint.sh
new file mode 100755
index 00000000..142a9a26
--- /dev/null
+++ b/contrib/docker/devel/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+	set -- ebusd "$@"
+fi
+
+exec "$@"
\ No newline at end of file