diff --git a/Dockerfile b/Dockerfile
index a389bda..d668e3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,10 @@ MAINTAINER Freifunk Rhein-Sieg e.V. <technik@freifunk-rhein-sieg.net>
 EXPOSE 80
 
 WORKDIR /project
-COPY _includes /usr/share/nginx/html/_includes
-COPY _layouts /usr/share/nginx/html/_layouts
-COPY _posts /usr/share/nginx/html/_posts
-COPY _scss /usr/share/nginx/html/_scss
-COPY assets /usr/share/nginx/html/assets
-COPY * /usr/share/nginx/html/
-ENTRYPOINT nginx -g "daemon off;"
+RUN apt-get update -y && apt-get install -y git ruby ruby-dev rubygems build-essential cron
+RUN gem install bundle
+RUN git init && git remote add origin https://git.freifunk-rhein-sieg.net/Freifunk-Rhein-Sieg/freifunk-rhein-sieg.net
+RUN touch /etc/cron.d/update && touch /srv/update.sh && chmod 775 /srv/update.sh && chmod 644 /etc/cron.d/update && touch /var/log/cron.log
+RUN echo "cd /project && git pull origin master && /usr/local/bin/jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html" > /srv/update.sh
+RUN echo "*/30 * * * * root /srv/update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/update
+ENTRYPOINT git fetch && git pull origin master && bundle install && bundle exec jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html && echo "ready" && /etc/init.d/cron start && nginx -g "daemon off;"
\ No newline at end of file