diff --git a/Dockerfile b/Dockerfile
index 9389c372..f68fbc08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN set -ex \
   && apk update \
   && apk add build-base python-dev py-pip jpeg-dev jpeg zlib zlib-dev \
      postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \
-     autoconf make g++ gcc git file gnupg re2c icu icu-dev \
+     autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \
   #&& echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
   #&& echo '@community http://nl.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
   #&& apk add php7-session@community \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8a21ccc2..3580f5cc 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -6,4 +6,8 @@ if [ ! -e '/var/www/html/version.php' ]; then
     chown -R www-data /var/www/html
 fi
 
+if [ -n "$TZ"]; then
+  cp /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+fi
+
 exec "$@"