diff --git a/README.md b/README.md
index bf7d545c9..7f2de2e96 100644
--- a/README.md
+++ b/README.md
@@ -545,6 +545,20 @@ Fully feature VSCode experience, to edit your HA config in the browser, includin
 
 [:books: Visual Studio Code add-on documentation][addon-doc-vscode]
 
+### ✓ [ZeroTier One][addon-zerotier]
+
+![Latest Version][zerotier-version-shield]
+![Supports armhf Architecture][zerotier-armhf-shield]
+![Supports armv7 Architecture][zerotier-armv7-shield]
+![Supports aarch64 Architecture][zerotier-aarch64-shield]
+![Supports amd64 Architecture][zerotier-amd64-shield]
+![Supports i386 Architecture][zerotier-i386-shield]
+![Docker Pulls][zerotier-pulls-shield]
+
+Radically simplify your network with a virtual networking layer that works the same everywhere
+
+[:books: ZeroTier One add-on documentation][addon-doc-zerotier]
+
 ### ✓ [chrony][addon-chrony]
 
 ![Latest Version][chrony-version-shield]
@@ -629,6 +643,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Traccar][traccar-issue]
 - [Open an issue for the add-on: UniFi Controller][unifi-issue]
 - [Open an issue for the add-on: Visual Studio Code][vscode-issue]
+- [Open an issue for the add-on: ZeroTier One][zerotier-issue]
 - [Open an issue for the add-on: chrony][chrony-issue]
 - [Open an issue for the add-on: motionEye][motioneye-issue]
 
@@ -1040,6 +1055,16 @@ SOFTWARE.
 [vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
+[addon-zerotier]: https://github.com/hassio-addons/addon-zerotier/tree/de161d4
+[addon-doc-zerotier]: https://github.com/hassio-addons/addon-zerotier/blob/de161d4/README.md
+[zerotier-issue]: https://github.com/hassio-addons/addon-zerotier/issues
+[zerotier-version-shield]: https://img.shields.io/badge/version-de161d4-blue.svg
+[zerotier-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/zerotier-armhf.svg
+[zerotier-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[zerotier-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[zerotier-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[zerotier-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
+[zerotier-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-chrony]: https://github.com/hassio-addons/addon-chrony/tree/abf1958
 [addon-doc-chrony]: https://github.com/hassio-addons/addon-chrony/blob/abf1958/README.md
 [chrony-issue]: https://github.com/hassio-addons/addon-chrony/issues
diff --git a/zerotier/CHANGELOG.md b/zerotier/CHANGELOG.md
new file mode 100644
index 000000000..614035782
--- /dev/null
+++ b/zerotier/CHANGELOG.md
@@ -0,0 +1,3 @@
+2019/03/25 23:16 UTC - [de161d4](https://github.com/hassio-addons/addon-zerotier/commit/de161d4c104cc15ce29663e5c71b0348e5c65833) by [@frenck](https://github.com/frenck)
+> :ambulance: Fixes missing ZeroTier link in README 
+
diff --git a/zerotier/README.md b/zerotier/README.md
new file mode 100644
index 000000000..32ce891ab
--- /dev/null
+++ b/zerotier/README.md
@@ -0,0 +1,58 @@
+# Community Hass.io Add-ons: ZeroTier One
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+[![Support my work on Patreon][patreon-shield]][patreon]
+
+Radically simplify your network with a virtual networking layer that works
+the same everywhere.
+
+## About
+
+ZeroTier delivers the capabilities of VPNs, SDN, and SD-WAN with a single
+system. Manage all your connected resources across both local and wide area
+networks as if the whole world is a single data center.
+
+People use ZeroTier to seamlessly connect laptops, desktops, phones,
+embedded devices, cloud resources, and apps any way they want anywhere they go.
+It transforms the entire world into a single data center, to which you
+can now add your Home Assistant instance using this add-on.
+
+[Click here for the full documentation][docs]
+
+## WARNING! THIS IS AN EDGE VERSION!
+
+This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
+add-ons are based upon the latest development version.
+
+- They may not work at all.
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+- Developers.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-zerotier/blob/de161d4/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
+[patreon-shield]: https://www.frenck.nl/images/patreon.png
+[patreon]: https://www.patreon.com/frenck
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-de161d4-blue.svg
+[release]: https://github.com/hassio-addons/addon-zerotier/tree/de161d4
\ No newline at end of file
diff --git a/zerotier/config.json b/zerotier/config.json
new file mode 100644
index 000000000..ad0253965
--- /dev/null
+++ b/zerotier/config.json
@@ -0,0 +1,44 @@
+{
+  "name": "ZeroTier One",
+  "version": "de161d4",
+  "slug": "zerotier",
+  "description": "Radically simplify your network with a virtual networking layer that works the same everywhere",
+  "url": "https://github.com/hassio-addons/addon-zerotier",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "hassio_role": "default",
+  "homeassistant_api": false,
+  "host_network": true,
+  "apparmor": true,
+  "privileged": [
+    "NET_ADMIN",
+    "SYS_ADMIN"
+  ],
+  "devices": [
+    "/dev/net/tun:/dev/net/tun:rwm"
+  ],
+  "map": [
+    "config",
+    "ssl:rw"
+  ],
+  "options": {
+    "network_id": "",
+    "port": 9993,
+    "api_auth_token": ""
+  },
+  "schema": {
+    "api_auth_token": "str",
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "network_id": "match([0-9a-z]{16})",
+    "port": "port"
+  },
+  "image": "hassioaddons/zerotier-{arch}"
+}
\ No newline at end of file
diff --git a/zerotier/icon.png b/zerotier/icon.png
new file mode 100644
index 000000000..a90b22a9e
Binary files /dev/null and b/zerotier/icon.png differ
diff --git a/zerotier/logo.png b/zerotier/logo.png
new file mode 100644
index 000000000..385d0ad26
Binary files /dev/null and b/zerotier/logo.png differ