diff --git a/.travis.yml b/.travis.yml
index 54015c055..ce9b00e2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,25 +6,25 @@ matrix:
   include:
     - python: "2.7"
       env: TARGET=Lint2.7
-      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 tzlocal pillow
+      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
       script:
         - flake8 esphomeyaml
         - pylint esphomeyaml
     - python: "3.5.3"
       env: TARGET=Lint3.5
-      install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 tzlocal pillow
+      install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow
       script:
         - flake8 esphomeyaml
         - pylint esphomeyaml
     - python: "2.7"
       env: TARGET=Test2.7
-      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 tzlocal pillow
+      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
       script:
         - esphomeyaml tests/test1.yaml compile
         - esphomeyaml tests/test2.yaml compile
     - python: "3.5.3"
       env: TARGET=Test3.5
-      install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 tzlocal pillow
+      install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow
       script:
         - esphomeyaml tests/test1.yaml compile
         - esphomeyaml tests/test2.yaml compile
diff --git a/Dockerfile b/Dockerfile
index 48342c012..4af3ac8a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,7 @@ COPY docker/platformio.ini /pio/platformio.ini
 RUN platformio run -d /pio; rm -rf /pio
 
 COPY . .
-RUN pip install --no-cache-dir --no-binary :all: -e . && \
-    pip install --no-cache-dir --no-binary :all: tzlocal
+RUN pip install --no-cache-dir --no-binary :all: -e .
 
 WORKDIR /config
 ENTRYPOINT ["esphomeyaml"]
diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio
index 45769710b..895049548 100644
--- a/docker/Dockerfile.hassio
+++ b/docker/Dockerfile.hassio
@@ -33,9 +33,6 @@ RUN \
     \
     && pip2 install --no-cache-dir --no-binary :all: -e /opt/esphomeyaml \
     \
-    # tzlocal for automatic timezone detection
-    && pip2 install --no-cache-dir --no-binary :all: tzlocal \
-    \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_libraries_interval 1000000 \
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 7855aadc8..9e16b74fb 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -3,4 +3,4 @@ FROM python:2.7
 COPY requirements.txt /requirements.txt
 
 RUN pip install -r /requirements.txt && \
-    pip install flake8==3.6.0 pylint==1.9.4 tzlocal pillow
+    pip install flake8==3.6.0 pylint==1.9.4 pillow
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index ec7708559..32978c078 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -18,5 +18,4 @@ RUN platformio run -d /pio; rm -rf /pio
 
 COPY requirements.txt /requirements.txt
 
-RUN pip install --no-cache-dir -r /requirements.txt && \
-    pip install --no-cache-dir tzlocal
+RUN pip install --no-cache-dir -r /requirements.txt
diff --git a/esphomeyaml-edge/Dockerfile b/esphomeyaml-edge/Dockerfile
index 8dfbdef03..e258d8b0f 100644
--- a/esphomeyaml-edge/Dockerfile
+++ b/esphomeyaml-edge/Dockerfile
@@ -31,9 +31,6 @@ RUN \
     \
     && pip2 install --no-cache-dir --no-binary :all: https://github.com/OttoWinter/esphomeyaml/archive/dev.zip \
     \
-    # tzlocal for automatic timezone detection
-    && pip2 install --no-cache-dir --no-binary :all: tzlocal \
-    \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_libraries_interval 1000000 \
diff --git a/setup.py b/setup.py
index 3288c3f7d..78a5378cd 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,7 @@ REQUIRES = [
     'esptool>=2.3.1',
     'typing>=3.0.0',
     'protobuf>=3.4',
+    'tzlocal>=1.4',
 ]
 
 CLASSIFIERS = [