diff --git a/esphomeyaml/Dockerfile b/esphomeyaml/Dockerfile
new file mode 100644
index 0000000000..65189f2f46
--- /dev/null
+++ b/esphomeyaml/Dockerfile
@@ -0,0 +1,20 @@
+# Dockerfile for HassIO add-on
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+ENV LANG C.UTF-8
+
+# Install requirements for add-on
+RUN apk add --no-cache python2 py2-pip git openssh libc6-compat && \
+    pip install --no-cache-dir platformio && \
+    platformio platform install espressif8266 \
+        --with-package tool-esptool \
+        --with-package framework-arduinoespressif8266 \
+        --with-package tool-mkspiffs \
+        --with-package tool-espotapy
+
+RUN pip install --no-cache-dir \
+      git+git://github.com/OttoWinter/esphomeyaml.git@v1.6.0 \
+      tornado esptool
+
+CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]
diff --git a/esphomeyaml/config.json b/esphomeyaml/config.json
new file mode 100644
index 0000000000..7c1df9dfb3
--- /dev/null
+++ b/esphomeyaml/config.json
@@ -0,0 +1,23 @@
+{
+  "name": "esphomeyaml",
+  "version": "1.6.0",
+  "slug": "esphomeyaml",
+  "description": "esphomeyaml HassIO add-on for intelligently managing all your ESP8266/ESP32 devices.",
+  "url": "https://esphomelib.com/esphomeyaml/index.html",
+  "startup": "application",
+  "webui": "http://[HOST]:[PORT:6052]",
+  "boot": "auto",
+  "ports": {
+    "6052/tcp": 6052,
+    "6053/tcp": 6053
+  },
+  "auto_uart": true,
+  "map": [
+    "config:rw"
+  ],
+  "options": {},
+  "environment": {
+    "ESPHOMEYAML_OTA_HOST_PORT": "6053"
+  },
+  "schema": {}
+}
diff --git a/repository.json b/repository.json
new file mode 100644
index 0000000000..a4198c300a
--- /dev/null
+++ b/repository.json
@@ -0,0 +1,5 @@
+{
+  "name": "esphomeyaml HassIO Add-On Repository",
+  "url": "https://github.com/OttoWinter/esphomeyaml",
+  "maintainer": "Otto Winter <contact@otto-winter.com>"
+}