diff --git a/CHANGELOG.md b/CHANGELOG.md
index eead24d..b964a78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 21137-RC5 (2019/12/07)
+
+* Fix timezone
+
 ## 21137-RC4 (2019/11/28)
 
 * Proxy type defaults to `https`
diff --git a/entrypoint.sh b/entrypoint.sh
index c36865e..30a9229 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+TZ=${TZ:-UTC}
+
 JLS_PATH="/opt/jetbrains-license-server"
 JLS_LISTEN_ADDRESS="0.0.0.0"
 JLS_PORT=8000
@@ -17,6 +19,11 @@ if [ -n "${PUID}" ] && [ "${PUID}" != "$(id -u jls)" ]; then
   sed -i -e "s/^jls:\([^:]*\):[0-9]*:\([0-9]*\)/jls:\1:${PUID}:\2/" /etc/passwd
 fi
 
+# Timezone
+echo "Setting timezone to ${TZ}..."
+ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
+echo ${TZ} > /etc/timezone
+
 # Init
 echo "Initializing files and folders..."
 su-exec jls:jls touch "/data/access-config.json"