diff --git a/Dockerfile b/Dockerfile
index f81045f7..f73fc582 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ VOLUME /srv
 EXPOSE 80
 
 COPY filebrowser /filebrowser
+COPY docker-entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT [ "/filebrowser", "-d /database.db" ]
-CMD [ "-p 80" ]
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "run" ]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100644
index 00000000..2a3b7ffb
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = 'run' ]; then
+  if [ ! -f "/database.db" ]; then
+    filebrowser -s /src
+  fi
+
+  exec filemanager --port 80
+fi
+
+exec filemanager --port 80 "$@"