diff --git a/Dockerfile b/Dockerfile
index 1459127..7662375 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM jeanblanchard/tomcat:8
 
-ENV SUBSONIC_VERSION="6.1.3" LC_ALL="C.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" TZ="Europe/Berlin" MAX_MEM="256"
+ENV AIRSONIC_VERSION="10.1.2" LC_ALL="C.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" TZ="Europe/Berlin" MAX_MEM="256"
 
 LABEL maintainer="Markus Birth <markus@birth-online.de>"
-LABEL version="$SUBSONIC_VERSION"
-LABEL description="Subsonic media streamer"
-LABEL org.label-schema.name="Subsonic" \
-      org.label-schema.url="http://www.subsonic.org/" \
+LABEL version="$AIRSONIC_VERSION"
+LABEL description="Airsonic is a free, web-based media streamer, providing ubiquitious access to your music."
+LABEL org.label-schema.name="Airsonic" \
+      org.label-schema.url="https://airsonic.github.io/" \
       org.label-schema.vcs-type="Git" \
-      org.label-schema.vcs-url="https://github.com/mbirth/docker-subsonic"
+      org.label-schema.vcs-url="https://github.com/airsonic/airsonic"
 
 RUN apk upgrade -U \
  && apk add ca-certificates openssl ffmpeg lame tzdata \
@@ -19,16 +19,13 @@ RUN apk upgrade -U \
  && ln -s /usr/bin/ffmpeg /data/transcode/ffmpeg \
  && cd  ${CATALINA_HOME}/webapps/ \
  && rm -rf ROOT \
- && wget -q "https://sourceforge.net/projects/subsonic/files/subsonic/$SUBSONIC_VERSION/subsonic-${SUBSONIC_VERSION}-war.zip" \
-    -O subsonic.war.zip \
- && unzip subsonic.war.zip \
- && rm subsonic.war.zip \
- && mv subsonic.war ROOT.war \
+ && wget -q "https://github.com/airsonic/airsonic/releases/download/v${AIRSONIC_VERSION}/airsonic.war" \
+    -O ROOT.war \
  && apk del tzdata \
  && rm -rf /var/cache/*
 
 ADD server.xml ${CATALINA_HOME}/conf/
-ENV JAVA_OPTS="-Xmx${MAX_MEM}m -Dsubsonic.host=0.0.0.0 -Dsubsonic.contextPath=/ -Dsubsonic.home=/data -Dsubsonic.defaultMusicFolder=/music/ -Dsubsonic.defaultPodcastFolder=/podcasts/ -Dsubsonic.defaultPlaylistFolder=/playlists/ -Djava.awt.headless=true"
+ENV JAVA_OPTS="-Xmx${MAX_MEM}m -Dserver.host=0.0.0.0 -Dserver.contextPath=/ -Dairsonic.home=/data -Dairsonic.defaultMusicFolder=/music/ -Dairsonic.defaultPodcastFolder=/podcasts/ -Dairsonic.defaultPlaylistFolder=/playlists/ -Djava.awt.headless=true"
 
 VOLUME ["/data", "/music/", "/playlists/", "/podcasts/"]
 
diff --git a/README.md b/README.md
index d6feec4..bb7be32 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,23 @@
 This repository contains configuration files for building a 
-[Docker](https://docker.com/) image for the Subsonic media streamer.
+[Docker](https://docker.com/) image for the Airsonic media streamer.
 
-[![](https://imagelayers.io/badge/mbirth/subsonic:latest.svg)](https://imagelayers.io/?images=mbirth/subsonic:latest 'Get your own badge on imagelayers.io')
-[![](https://images.microbadger.com/badges/image/mbirth/subsonic.svg)](http://microbadger.com/#/images/mbirth/subsonic "Get your own image badge on microbadger.com")
+[![](https://imagelayers.io/badge/mbirth/airsonic:latest.svg)](https://imagelayers.io/?images=mbirth/airsonic:latest 'Get your own badge on imagelayers.io')
+[![](https://images.microbadger.com/badges/image/mbirth/airsonic.svg)](http://microbadger.com/#/images/mbirth/airsonic "Get your own image badge on microbadger.com")
 
 
 Noteworthy
 ----------
 
-* [Subsonic 6.1.3](http://www.subsonic.org/)
+* [Airsonic 10.1.2](https://airsonic.github.io/)
 * based on [cyrilix](https://github.com/cyrilix)/[docker-subsonic](https://github.com/cyrilix/docker-subsonic)
 * uses [jeanblanchard](https://github.com/jeanblanchard)/[tomcat](https://hub.docker.com/r/jeanblanchard/tomcat/) with Alpine Linux
-* compiles to a 262 MB image instead of [cyrilix](https://hub.docker.com/r/cyrilix/subsonic/)'s 484 MB
+* compiles to a 266 MB image instead of [cyrilix](https://hub.docker.com/r/cyrilix/subsonic/)'s 484 MB
 
 
 Volumes
 -------
 
-* `/subsonic` --- Directory to store Subsonic's log, configuration and database
+* `/data` --- Directory to store Airsonic's log, configuration and database
 * `/music` --- Default music folder
 * `/podcasts` --- Default podcast folder
 * `/playlists` --- Default playlist folder
@@ -34,7 +34,7 @@ Build your own image
 --------------------
 
 ```shell
-$ docker build -t <your-name>/docker-subsonic .
+$ docker build -t <your-name>/docker-airsonic .
 ```
 
 
@@ -44,11 +44,11 @@ Get a pre-built image
 A current image is available as a trusted build from the Docker index:
 
 ```shell
-$ docker pull mbirth/subsonic
+$ docker pull mbirth/airsonic
 ```
 
 The repository page is at
-https://hub.docker.com/r/mbirth/subsonic/
+https://hub.docker.com/r/mbirth/airsonic/
 
 
 Run a container with this image
@@ -59,6 +59,6 @@ $ docker run \
   --detach \
   --publish 8080:8080 \
   --volume "/wherever/your/music/is:/music/:ro" \
-  <your-name>/subsonic
+  <your-name>/airsonic
 
 ```