diff --git a/Dockerfile b/Dockerfile
index 414939d..5e9829a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER sparklyballs
 
 # set version label
@@ -9,28 +9,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 # package version
 ARG DAAPD_VER="24.2"
 
-# install runtime packages
-RUN \
- apk add --no-cache \
-	avahi \
-	confuse \
-	dbus \
-	ffmpeg \
-	json-c \
-	libcurl \
-	libevent \
-	libgcrypt \
-	libplist \
-	libunistring \
-	protobuf-c \
-	sqlite \
-	sqlite-libs && \
- apk add --no-cache \
- --repository http://nl.alpinelinux.org/alpine/edge/testing \
-	libantlr3c \
-	mxml && \
-
 # install build packages
+RUN \
  apk add --no-cache --virtual=build-dependencies \
 	alsa-lib-dev \
 	autoconf \
@@ -68,6 +48,26 @@ RUN \
 	libantlr3c-dev \
 	mxml-dev && \
 
+# install runtime packages
+ apk add --no-cache \
+	avahi \
+	confuse \
+	dbus \
+	ffmpeg \
+	json-c \
+	libcurl \
+	libevent \
+	libgcrypt \
+	libplist \
+	libunistring \
+	protobuf-c \
+	sqlite \
+	sqlite-libs && \
+ apk add --no-cache \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
+	libantlr3c \
+	mxml && \
+
 # make antlr wrapper
  mkdir -p \
 	/tmp/source/forked-daapd && \
@@ -117,5 +117,3 @@ COPY root/ /
 
 # ports and volumes
 VOLUME /config /music
-
-
diff --git a/README.md b/README.md
index 4bee7b7..737bf9e 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,7 @@ For further setup options of remotes etc, check out the daapd website, [Forked-d
 
 ## Versions
 
++ **26.05.17:** Rebase to alpine linux 3.6.
 + **06.02.17:** Rebase to alpine linux 3.5.
 + **10.01.17:** Bump to 24.2.
 + **14.10.16:** Add version layer information.