diff --git a/README.md b/README.md
index b9477f29..88ccddc5 100644
--- a/README.md
+++ b/README.md
@@ -285,6 +285,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]
+
+Manage your UniFi network using a web browser
+
+[:books: UniFi Controller add-on documentation][addon-doc-unifi]
+
 ## Releases
 
 Releases are based on [Semantic Versioning][semver], and use the format
@@ -332,6 +345,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]
 
@@ -552,6 +566,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/v0.1.0
+[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/v0.1.0/README.md
+[unifi-issue]: https://github.com/hassio-addons/addon-unifi/issues
+[unifi-version-shield]: https://img.shields.io/badge/version-v0.1.0-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 00000000..7332d310
--- /dev/null
+++ b/unifi/CHANGELOG.md
@@ -0,0 +1 @@
+:tada: Initial release!
\ No newline at end of file
diff --git a/unifi/README.md b/unifi/README.md
new file mode 100644
index 00000000..88c95179
--- /dev/null
+++ b/unifi/README.md
@@ -0,0 +1,53 @@
+# Community Hass.io Add-ons: UniFi Controller
+
+[![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]
+
+The UniFi Controller allows you to manage your UniFi network
+using a web browser.
+
+## About
+
+This add-on runs Ubiquiti Networks' UniFi Controller software, which allows
+you to manage your UniFi network via the web browser. The add-on provides a
+single-click installation and run solution for Hass.io, allowing users to get
+their network up, running, and updated, easily.
+
+This add-on supports all Hass.io supported architectures, including the
+Raspberry Pi.
+
+[Click here for the full documentation][docs]
+
+![UniFi Controller][screenshot]
+
+## WARNING! THIS IS A BETA VERSION!
+
+This Hass.io Add-ons repository contains beta releases of add-ons.
+
+- 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.
+
+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/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-unifi/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-unifi-controller/56297?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-unifi/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-unifi/raw/master/images/screenshot.jpg
\ No newline at end of file
diff --git a/unifi/config.json b/unifi/config.json
new file mode 100644
index 00000000..e21558c7
--- /dev/null
+++ b/unifi/config.json
@@ -0,0 +1,50 @@
+{
+  "name": "UniFi Controller",
+  "version": "0.1.0",
+  "slug": "unifi",
+  "description": "Manage your UniFi network using a web browser",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-unifi-controller/56297?u=frenck",
+  "webui": "https://[HOST]:[PORT:8443]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "map": [
+    "config:rw",
+    "backup: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 00000000..9563fa01
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 00000000..2e113949
Binary files /dev/null and b/unifi/logo.png differ