diff --git a/Dockerfile b/Dockerfile
index f880835..8a9f894 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,14 @@ RUN apt-get update && \
     apt-get install -y wget && \
     apt-get install -y openjdk-8-jre-headless wget sudo
 
-RUN wget -qO /tmp/subsonic.deb https://s3-eu-west-1.amazonaws.com/subsonic-public/download/subsonic-6.1.beta2.deb && \
+RUN mkdir /tools && \
+    wget -qO /tmp/subsonic.deb https://s3-eu-west-1.amazonaws.com/subsonic-public/download/subsonic-6.1.5.deb && \
+    wget -qO /tools/hsqldb-1.8.0.5.jar http://repo1.maven.org/maven2/hsqldb/hsqldb/1.8.0.5/hsqldb-1.8.0.5.jar && \
+    wget -qO /tools/sqltool-2.0.0.jar http://repo1.maven.org/maven2/org/hsqldb/sqltool/2.0.0/sqltool-2.0.0.jar && \
     dpkg -i /tmp/subsonic.deb && \
     useradd subsonic && \
     mkdir /var/subsonic/lucene2 && \
-    chown -R subsonic:subsonic /var/subsonic && \
-    mkdir /tools && \
-    wget -qO /tools/hsqldb-1.8.0.5.jar http://repo1.maven.org/maven2/hsqldb/hsqldb/1.8.0.5/hsqldb-1.8.0.5.jar && \
-    wget -qO /tools/sqltool-2.0.0.jar http://repo1.maven.org/maven2/org/hsqldb/sqltool/2.0.0/sqltool-2.0.0.jar
+    chown -R subsonic:subsonic /var/subsonic
 
 ADD start /start
 ENTRYPOINT ["/start"]
-
diff --git a/README.md b/README.md
index 5fcf0c0..dc568a8 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,14 @@ docker-subsonic
 
 *Persistence*
 
-To make the subsonic database persistent, a file and a dir must be mounted to the host:
+To make the subsonic database persistent, two paths - a dir and a file - need to be persistent. Additionally, Subsonic generates an index of metadata that should be made persistent as well.
 
 * -v /hostpath/subsonic/db:/var/subsonic/db
 * -v /hostpath/subsonic/subsonic.properties:/var/subsonic/subsonic.properties
+* -v /hostpath/subsonic/db:/var/subsonic/db
+* -v /hostpath/subsonic/metadata:/var/subsonic/lucene2
 
-Both locations must be read/writable by uid 1000.
+All persistent locations must be read/writable by uid/gid 1000.
 
 *TODO*
 
diff --git a/start b/start
index f80b231..3e86c3e 100755
--- a/start
+++ b/start
@@ -10,7 +10,7 @@ fi
 
 
 # Start the main service
+rm -vf /var/subsonic/db/subsonic.lck
 cd /usr/share/subsonic
 chown -R subsonic:subsonic /var/subsonic
-sudo -Hu subsonic java -Xmx256m -Dsubsonic.home=/var/subsonic -Dsubsonic.host=0.0.0.0 -Dsubsonic.port=4051 -Dsubsonic.httpsPort=4050 -Dsubsonic.contextPath=/ -Dsubsonic.defaultMusicFolder=/var/music -Dsubsonic.defaultPodcastFolder=/var/music/Podcast -Dsubsonic.defaultPlaylistFolder=/var/playlists -Djava.awt.headless=true -verbose:gc -jar subsonic-booter-jar-with-dependencies.jar
-
+exec sudo -Hu subsonic java -Xmx256m -Dsubsonic.home=/var/subsonic -Dsubsonic.host=0.0.0.0 -Dsubsonic.port=4051 -Dsubsonic.httpsPort=4050 -Dsubsonic.contextPath=/ -Dsubsonic.defaultMusicFolder=/var/music -Dsubsonic.defaultPodcastFolder=/var/music/Podcast -Dsubsonic.defaultPlaylistFolder=/var/playlists -Djava.awt.headless=true -verbose:gc -jar subsonic-booter-jar-with-dependencies.jar