diff --git a/Dockerfile b/Dockerfile
index e5d3970..56e60aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,20 @@
-FROM debian:experimental
-MAINTAINER Jens Erat <email@jenserat.de>
+FROM debian
+MAINTAINER Jean-Christophe Hoelt <hoelt@fovea.cc>
+
+ENV TINC_VERSION=1.1~pre17-1.2
 
 # Remove SUID programs
 RUN for i in `find / -perm +6000 -type f 2>/dev/null`; do chmod a-s $i; done
 
-RUN echo "deb http://http.debian.net/debian experimental main" >> /etc/apt/sources.list && \
+RUN \
+    export DEBIAN_FRONTEND=noninteractive && \
+    mkdir -p /etc/tinc/nets.boot && \
+    echo "deb-src http://httpredir.debian.org/debian/ experimental main contrib non-free"  >> /etc/apt/sources.list && \
     apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y -t experimental tinc && \
+    apt-get install -y net-tools && \
+    apt-get build-dep -y tinc=${TINC_VERSION} && \
+    apt-get source --compile tinc=${TINC_VERSION} && \
+    dpkg -i tinc_${TINC_VERSION}_amd64.deb && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 EXPOSE 655/tcp 655/udp
diff --git a/README.md b/README.md
index ee60b65..59bb8aa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # tinc for Docker
 
-Dockerfile (c) 2015 Jens Erat, email@jenserat.de  
+Dockerfile (c) 2015 Jens Erat, email@jenserat.de
+
+Contributor: Jean-Christophe Hoelt
+
 Licensed under BSD license
 
 > [tinc](http://www.tinc-vpn.org) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet.