diff --git a/Dockerfile b/Dockerfile
index be68d4c..c369e64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG FFMPEG_VER="ffmpeg"
 ARG TVH_VER="v4.2.1"
 ARG TZ="Europe/Oslo"
 ARG XMLTV_VER="0.5.69"
@@ -26,22 +25,23 @@ RUN \
 	automake \
 	cmake \
 	coreutils \
-	${FFMPEG_VER}-dev \
+	ffmpeg-dev \
 	file \
 	findutils \
 	g++ \
 	gcc \
 	gettext-dev \
 	git \
-	libhdhomerun-dev \
 	libgcrypt-dev \
+	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libxml2-dev \
 	libxslt-dev \
 	make \
 	mercurial \
-	libressl-dev \
 	patch \
+	pcre2-dev \
 	perl-dev \
 	pkgconf \
 	sdl-dev \
@@ -52,7 +52,6 @@ RUN \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev && \
 
-
 # add runtime dependencies required in build stage
  apk add --no-cache \
 	bsd-compat-headers \
@@ -61,9 +60,10 @@ RUN \
 	gzip \
 	libcrypto1.0 \
 	libcurl	\
+	libressl \
 	libssl1.0 \
 	linux-headers \
-	libressl \
+	pcre2 \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
@@ -78,6 +78,7 @@ RUN \
 	perl-dbd-sqlite \
 	perl-dbi \
 	perl-digest-sha1 \
+	perl-doc \
 	perl-file-slurp \
 	perl-file-temp \
 	perl-file-which \
@@ -194,8 +195,8 @@ RUN \
 
 # install runtime packages
  apk add --no-cache \
-	${FFMPEG_VER} \
-	${FFMPEG_VER}-libs \
+	ffmpeg \
+	ffmpeg-libs \
 	libhdhomerun-libs \
 	libxml2 \
 	libxslt && \
diff --git a/README.md b/README.md
index 3f51842..194fd0e 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
++ **27.05.2017:** Rebase to alpine 3.6.
 + **01.05.2017:** Update to tvheadend 4.2.1 stable.
 + **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
 + **09.04.2017:** Chain cpanm installs in one block and use --installdeps.