diff --git a/Dockerfile b/Dockerfile
index 96836a7..dd3b05a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,26 +10,12 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv-keys E5267A6C && \
 ENV DOKUWIKI_VERSION 2016-06-26a
 ENV MD5_CHECKSUM 9b9ad79421a1bdad9c133e859140f3f2
 
-RUN mkdir -p /var/www /var/dokuwiki-storage/data && \
+RUN mkdir -p /var/www && \
     cd /var/www && \
     curl -O "http://download.dokuwiki.org/src/dokuwiki/dokuwiki-$DOKUWIKI_VERSION.tgz" && \
     echo "$MD5_CHECKSUM  dokuwiki-$DOKUWIKI_VERSION.tgz" | md5sum -c - && \
     tar xzf "dokuwiki-$DOKUWIKI_VERSION.tgz" --strip 1 && \
-    rm "dokuwiki-$DOKUWIKI_VERSION.tgz" && \
-    mv /var/www/data/pages /var/dokuwiki-storage/data/pages && \
-    ln -s /var/dokuwiki-storage/data/pages /var/www/data/pages && \
-    mv /var/www/data/meta /var/dokuwiki-storage/data/meta && \
-    ln -s /var/dokuwiki-storage/data/meta /var/www/data/meta && \
-    mv /var/www/data/media /var/dokuwiki-storage/data/media && \
-    ln -s /var/dokuwiki-storage/data/media /var/www/data/media && \
-    mv /var/www/data/media_attic /var/dokuwiki-storage/data/media_attic && \
-    ln -s /var/dokuwiki-storage/data/media_attic /var/www/data/media_attic && \
-    mv /var/www/data/media_meta /var/dokuwiki-storage/data/media_meta && \
-    ln -s /var/dokuwiki-storage/data/media_meta /var/www/data/media_meta && \
-    mv /var/www/data/attic /var/dokuwiki-storage/data/attic && \
-    ln -s /var/dokuwiki-storage/data/attic /var/www/data/attic && \
-    mv /var/www/conf /var/dokuwiki-storage/conf && \
-    ln -s /var/dokuwiki-storage/conf /var/www/conf
+    rm "dokuwiki-$DOKUWIKI_VERSION.tgz"
 
 RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php5/fpm/php.ini
 RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf
diff --git a/start.sh b/start.sh
index 3c39736..708b9e3 100755
--- a/start.sh
+++ b/start.sh
@@ -2,6 +2,18 @@
 
 set -e
 
+if ! [ -e /var/dokuwiki-storage/data ]; then
+    mkdir -p /var/www /var/dokuwiki-storage/data
+fi
+
+for dir in data/pages data/meta data/media data/media_attic data/media_meta data/attic conf; do
+    if ! [ -e /var/dokuwiki-storage/$dir ]; then
+        cp -r /var/www/$dir /var/dokuwiki-storage/$dir
+    fi
+    rm -rf /var/www/$dir
+    ln -s /var/dokuwiki-storage/$dir /var/www/$dir
+done
+
 chown -R www-data:www-data /var/www
 chown -R www-data:www-data /var/dokuwiki-storage