diff --git a/subsonic/Dockerfile b/libresonic/Dockerfile
similarity index 54%
rename from subsonic/Dockerfile
rename to libresonic/Dockerfile
index ddb78d5..5db66a0 100644
--- a/subsonic/Dockerfile
+++ b/libresonic/Dockerfile
@@ -1,19 +1,21 @@
-FROM alpine:3.5
+FROM alpine:edge
 
-ARG VERSION=6.0
+ARG VERSION=6.2.beta1
 
 ENV UID=991 GID=991 \
     HTTPSPORT=0
 
-WORKDIR /subsonic
+WORKDIR /libresonic
 
-RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/apk/repositories \
- && apk -U add \
+RUN echo "@community https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+ && apk -U upgrade && apk add \
     ffmpeg \
     su-exec \
+    libressl \
+    ca-certificates \
     openjdk8-jre@community \
     tini@community \
- && wget -qO- http://subsonic.org/download/subsonic-${VERSION}-standalone.tar.gz | tar zxf - \
+ && wget -q https://github.com/Libresonic/libresonic/releases/download/v${VERSION}/libresonic-v${VERSION}.war -O libresonic.war \
  && rm -f /var/cache/apk/*
 
 COPY run.sh /usr/local/bin/run.sh
@@ -25,7 +27,7 @@ EXPOSE 4040 4050
 VOLUME /data /musics /playlists /podcasts
 
 LABEL description "Open source media streamer" \
-      subsonic "Subsonic v$VERSION" \
+      libresonic "Libresonic v$VERSION" \
       maintainer="Wonderfall <wonderfall@targaryen.house>"
 
 CMD ["run.sh"]
diff --git a/subsonic/README.md b/libresonic/README.md
similarity index 100%
rename from subsonic/README.md
rename to libresonic/README.md
diff --git a/libresonic/run.sh b/libresonic/run.sh
new file mode 100644
index 0000000..49c0068
--- /dev/null
+++ b/libresonic/run.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+mkdir -p /data/transcode
+ln -s /usr/bin/ffmpeg /data/transcode/ffmpeg
+ln -s /usr/bin/lame /data/transcode/lame
+
+chown -R $UID:$GID /data /playlists /libresonic
+
+exec su-exec $UID:$GID tini -- \
+java -Xmx256m \
+  -Dlibresonic.home=/data \
+  -Dlibresonic.host=0.0.0.0 \
+  -Dlibresonic.port=4040 \
+  -Dlibresonic.httpsPort=$HTTPSPORT \
+  -Dlibresonic.contextPath=/ \
+  -Dlibresonic.defaultMusicFolder=/musics \
+  -Dlibresonic.defaultPodcastFolder=/podcasts \
+  -Dlibresonic.defaultPlaylistFolder=/playlists \
+  -Djava.awt.headless=true \
+  -jar libresonic.war
diff --git a/subsonic/run.sh b/subsonic/run.sh
deleted file mode 100644
index aba36ef..0000000
--- a/subsonic/run.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-mkdir -p /data/transcode
-ln -s /usr/bin/ffmpeg /data/transcode/ffmpeg
-ln -s /usr/bin/lame /data/transcode/lame
-
-chown -R $UID:$GID /data /playlists /subsonic
-
-exec su-exec $UID:$GID tini -- \
-java -Xmx256m \
-  -Dsubsonic.home=/data \
-  -Dsubsonic.host=0.0.0.0 \
-  -Dsubsonic.port=4040 \
-  -Dsubsonic.httpsPort=$HTTPSPORT \
-  -Dsubsonic.contextPath=/ \
-  -Dsubsonic.defaultMusicFolder=/musics \
-  -Dsubsonic.defaultPodcastFolder=/podcasts \
-  -Dsubsonic.defaultPlaylistFolder=/playlists \
-  -Djava.awt.headless=true \
-  -jar subsonic-booter-jar-with-dependencies.jar