diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..1db73caf9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,60 @@
+# Dockerfile for S2SS development and testing
+#
+# Use this Dockerfile running:
+#    $ make docker
+#
+# @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC
+#   This file is part of S2SS. All Rights Reserved. Proprietary and confidential.
+#   Unauthorized copying of this file, via any medium is strictly prohibited. 
+###################################################################################
+
+FROM stv0g/dotfiles
+#FROM debian:jessie
+
+MAINTAINER "Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+
+# Update package manager
+RUN apt-get update
+
+# Install development environement
+RUN apt-get -y install \
+        gcc \
+	gdb \
+	make \
+	libc6-dev \
+        pkg-config
+
+# Install dependencies for native arch
+RUN apt-get -y install \
+        libconfig-dev \
+        libnl-3-dev \
+        libnl-route-3-dev \
+        libpci-dev \
+        libjansson-dev \
+        libcurl4-openssl-dev \
+        uuid-dev
+
+# Install dependencies for 32bit x86 arch (required for 32bit libOpalAsync)
+#  (64 bit header files are used)
+RUN dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get -y install \
+	libc6-dev-i386 \
+	lib32gcc-4.9-dev \
+        libconfig9:i386 \
+        libnl-3-200:i386 \
+        libnl-route-3-200:i386 \
+        libpci3:i386 \
+        libjansson4:i386 \
+        libcurl3:i386 \
+        libuuid1:i386
+
+# Checkout source code from GitHub
+#RUN git clone git@github.com:RWTH-ACS/S2SS.git /s2ss
+
+WORKDIR /s2ss
+
+# Compile
+#RUN make -C /s2ss
+
+ENTRYPOINT /bin/bash
\ No newline at end of file
diff --git a/Makefile b/Makefile
index bedfed690..9a4bb0086 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ endif
 
 ######## Targets ########
 
-.PHONY: all clean install release
+.PHONY: all clean install release docker
 
 # Default target: build everything
 all: $(LIBS) $(TARGETS)
@@ -107,5 +107,9 @@ clean:
 	$(RM) $(TARGETS)
 	$(RM) -rf doc/{html,latex}
 
+docker:
+	docker build -t s2ss .
+	docker run -itv $(PWD):/s2ss s2ss
+
 # Include auto-generated dependencies
 -include $(wildcard *.d)