diff --git a/Dockerfile b/Dockerfile
index 5e91f7f..6cbf46e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,29 @@
 FROM lsiobase/alpine.python:3.5
 MAINTAINER smdion <me@seandion.com> ,sparklyballs
 
-# install packages
-RUN \
- apk add --no-cache \
-	ffmpeg \
-	mc
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# install build packages
+# install build packages
 RUN \
  apk add --no-cache --virtual=build-dependencies \
- 	g++ \
+	g++ \
 	gcc \
 	make && \
 
-# compile shntool
+# install runtime packages
+ apk add --no-cache \
+	ffmpeg \
+	mc && \
+
+# compile shntool
  mkdir -p \
 	/tmp/shntool && \
  curl -o \
  /tmp/shntool-src-tar.gz -L \
-	http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz && \
+	http://shnutils.freeshell.org/shntool/dist/src/shntool-3.0.10.tar.gz && \
  tar xf /tmp/shntool-src-tar.gz -C \
 	/tmp/shntool --strip-components=1 && \
  cd /tmp/shntool && \
@@ -32,7 +36,7 @@ RUN \
  make && \
  make install && \
 
-# cleanup
+# cleanup
  apk del --purge \
 	build-dependencies && \
  rm -rf \
@@ -42,6 +46,6 @@ RUN \
 # add local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 8181
 VOLUME /config /downloads /music
diff --git a/README.md b/README.md
index ebd7261..0518cd3 100755
--- a/README.md
+++ b/README.md
@@ -73,6 +73,7 @@ Access WebUI at `<your-ip>:8181` and walk through the wizard.
 
 ## Version History
 
++ **03.05.17:** Reduce layer, replace broken source for shntool.
 + **07.02.17:** Rebase to alpine 3.5.
 + **23.12.16:** Fix capitalisation in README.
 + **09.09.16:** Add layer badges to README.