diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..dfa47145fc4aac9dc4b7c2ea19aad44d1b049ac1
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.git/
+README*
+LICENSE*
diff --git a/Dockerfile b/Dockerfile
index 9a1e384e00fea88d4346259f17101efbec0a921d..1e9fcd227cfc674b90e699b162c9161c8ba5a946 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,8 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     mkdir /syncevolution
+VOLUME /syncevolution
 COPY entrypoint.sh /entrypoint.sh
 EXPOSE 9000
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--start-dbus-session", "http://0.0.0.0:9000/syncevolution"]
+CMD ["syncevo-http-server", "--start-dbus-session", "http://0.0.0.0:9000/syncevolution"]
diff --git a/entrypoint.sh b/entrypoint.sh
index dc10e374196f15daf298c987801e5d4f160acb59..424c9bf5c107d3f5acfcd9a467fd4b6f6a6ba678 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -31,4 +31,4 @@ syncevolution --configure \
 syncevolution --configure \
               --source-property sync=slow \
               cellphone addressbook calendar todo memo calendar+todo
-exec /usr/bin/syncevo-http-server $@
+eval exec $@