diff --git a/Dockerfile b/Dockerfile
index d7fca2747b2e7cb3dc6a81147d49d004034156fa..d0bca933864e5c8c693ae5a8349ed017cfb1858f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER Gonzalo Peci <davyjones@linuxserver.io>, sparklyballs
 
 # environment variables
@@ -9,29 +9,27 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# install runtime packages
+# install build packages
 RUN \
+ apk add --no-cache --virtual=build-dependencies \
+	g++ \
+	gcc \
+	libffi-dev \
+	openssl-dev \
+	py2-pip \
+	python2-dev && \
+
+# install runtime packages
  apk add --no-cache \
 	ca-certificates \
+	openssl \
 	p7zip \
 	unrar \
 	unzip && \
  apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/main \
-	libressl2.5-libssl && \
-  apk add --no-cache \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	deluge && \
 
-# install build packages
- apk add --no-cache --virtual=build-dependencies \
-	g++ \
-	gcc \
-	libffi-dev \
-	libressl-dev \
-	py2-pip \
-	python2-dev && \
-
 # install pip packages
  pip install --no-cache-dir -U \
 	incremental \
diff --git a/README.md b/README.md
index f8b63646ee45e63ffb2e44e0cf4133339a7db2d1..7fd19d66e7e39606159bd8a0bc40a40f688bda6d 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ Change the downloads location in the webui in Preferences->Downloads and use /do
 
 ## Versions
 
++ **26.05.17:** Rebase to alpine 3.6.
 + **29.04.17:** Add variable for user defined umask.
 + **28.04.17:** update to libressl2.5-libssl.
 + **28.12.16:** Rebase to alpine 3.5 baseimage.