diff --git a/README.md b/README.md
index 1c60e8945..b702f0979 100644
--- a/README.md
+++ b/README.md
@@ -301,6 +301,19 @@ Protect your privacy and access Home Assistant via Tor.
 
 [:books: Tor add-on documentation][addon-doc-tor]
 
+### ✓ [UniFi Controller][addon-unifi]
+
+![Latest Version][unifi-version-shield]
+![Supports armhf Architecture][unifi-armhf-shield]
+![Supports aarch64 Architecture][unifi-aarch64-shield]
+![Supports amd64 Architecture][unifi-amd64-shield]
+![Supports i386 Architecture][unifi-i386-shield]
+![Docker Pulls][unifi-pulls-shield]
+
+Lorem ipsum.
+
+[:books: UniFi Controller add-on documentation][addon-doc-unifi]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -341,6 +354,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: SonWEB][sonweb-issue]
 - [Open an issue for the add-on: Terminal][terminal-issue]
 - [Open an issue for the add-on: Tor][tor-issue]
+- [Open an issue for the add-on: UniFi Controller][unifi-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -570,6 +584,15 @@ SOFTWARE.
 [tor-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tor-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [tor-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-unifi]: https://github.com/hassio-addons/addon-unifi/tree/daf4798
+[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/daf4798/README.md
+[unifi-issue]: https://github.com/hassio-addons/addon-unifi/issues
+[unifi-version-shield]: https://img.shields.io/badge/version-daf4798-blue.svg
+[unifi-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/unifi.svg
+[unifi-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[unifi-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[unifi-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[unifi-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [awesome-shield]: https://img.shields.io/badge/awesome%3F-yes-brightgreen.svg
 [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
 [discord]: https://discord.gg/c5DvZ4e
diff --git a/unifi/CHANGELOG.md b/unifi/CHANGELOG.md
new file mode 100644
index 000000000..4d8952ea3
--- /dev/null
+++ b/unifi/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/06/10 20:56 UTC - [daf4798](https://github.com/hassio-addons/addon-unifi/commit/daf4798de1f49991330db03b2c41526d8624f79d) by [@frenck](https://github.com/frenck)
+> :sparkles: Initial add-on code 
+
diff --git a/unifi/config.json b/unifi/config.json
new file mode 100644
index 000000000..6298a967d
--- /dev/null
+++ b/unifi/config.json
@@ -0,0 +1,49 @@
+{
+  "name": "UniFi Controller",
+  "version": "daf4798",
+  "slug": "unifi",
+  "description": "Lorem ipsum.",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "map": [
+    "config:rw",
+    "ssl"
+  ],
+  "boot": "auto",
+  "ports": {
+    "1900/udp": 1900,
+    "3478/udp": 3478,
+    "6789/tcp": 6789,
+    "8080/tcp": 8080,
+    "8443/tcp": 8443,
+    "8843/tcp": 8843,
+    "8880/tcp": 8880,
+    "10001/udp": 10001
+  },
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "options": {
+    "log_level": "info",
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/unifi"
+}
\ No newline at end of file
diff --git a/unifi/icon.png b/unifi/icon.png
new file mode 100644
index 000000000..9563fa01d
Binary files /dev/null and b/unifi/icon.png differ
diff --git a/unifi/logo.png b/unifi/logo.png
new file mode 100644
index 000000000..2e1139490
Binary files /dev/null and b/unifi/logo.png differ