diff --git a/Dockerfile b/Dockerfile
index cba4410..6960af5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,20 +5,20 @@
 # TO_RUN:         docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki
 
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER Miroslav Prasil <miroslav@prasil.info>
 
 # Set the version you want of Twiki
 ARG DOKUWIKI_VERSION=2017-02-19e
 ARG DOKUWIKI_CSUM=09bf175f28d6e7ff2c2e3be60be8c65f
 
-ENV LAST_REFRESHED 12. August 2016
+ENV LAST_REFRESHED 25. October 2017
 
 # Update & install packages & cleanup afterwards
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update && \
     apt-get -y upgrade && \
-    apt-get -y install wget lighttpd php5-cgi php5-gd php5-ldap php5-curl && \
+    apt-get -y install wget lighttpd php-cgi php-gd php-ldap php-curl php-mbstring && \
     apt-get clean autoclean && \
     apt-get autoremove && \
     rm -rf /var/lib/{apt,dpkg,cache,log}
diff --git a/dokuwiki.conf b/dokuwiki.conf
index 51e0f47..468e37c 100644
--- a/dokuwiki.conf
+++ b/dokuwiki.conf
@@ -6,7 +6,7 @@ fastcgi.server = ( ".php" =>
 	( "localhost" =>
 	  (
 	    "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-	    "bin-path" => "/usr/bin/php5-cgi",
+	    "bin-path" => "/usr/bin/php-cgi",
 	    "allow-x-send-file" => "enable"
 	  )
 	)
@@ -15,11 +15,11 @@ fastcgi.server = ( ".php" =>
 $HTTP["host"] =~ "." {
 	server.document-root = "/dokuwiki"
 	static-file.exclude-extensions = ( ".php" )
-	 
+
 	# deny access completely to these
 	$HTTP["url"] =~ "/(\.|_)ht" { url.access-deny = ( "" ) }
 	$HTTP["url"] =~ "^/(bin|data|inc|conf)/"  { url.access-deny = ( "" ) }
-	 
+
 	# rewrites for dokuwiki
 	$HTTP["url"] =~ "^" { index-file.names = ("doku.php") }
 	url.rewrite = (