diff --git a/README.md b/README.md
index 6d18c12a8..82ad14665 100644
--- a/README.md
+++ b/README.md
@@ -431,6 +431,19 @@ Manage your UniFi network using a web browser
 
 [:books: UniFi Controller add-on documentation][addon-doc-unifi]
 
+### ✓ [motionEye][addon-motioneye]
+
+![Latest Version][motioneye-version-shield]
+![Supports armhf Architecture][motioneye-armhf-shield]
+![Supports aarch64 Architecture][motioneye-aarch64-shield]
+![Supports amd64 Architecture][motioneye-amd64-shield]
+![Supports i386 Architecture][motioneye-i386-shield]
+![Docker Pulls][motioneye-pulls-shield]
+
+Simple, elegant and feature-rich CCTV/NVR for your camera's
+
+[:books: motionEye add-on documentation][addon-doc-motioneye]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -481,6 +494,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Tautulli][tautulli-issue]
 - [Open an issue for the add-on: Tor][tor-issue]
 - [Open an issue for the add-on: UniFi Controller][unifi-issue]
+- [Open an issue for the add-on: motionEye][motioneye-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -800,6 +814,15 @@ SOFTWARE.
 [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
+[addon-motioneye]: https://github.com/hassio-addons/addon-motioneye/tree/44fbe60
+[addon-doc-motioneye]: https://github.com/hassio-addons/addon-motioneye/blob/44fbe60/README.md
+[motioneye-issue]: https://github.com/hassio-addons/addon-motioneye/issues
+[motioneye-version-shield]: https://img.shields.io/badge/version-44fbe60-blue.svg
+[motioneye-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/motioneye.svg
+[motioneye-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[motioneye-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[motioneye-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[motioneye-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/motioneye/CHANGELOG.md b/motioneye/CHANGELOG.md
new file mode 100644
index 000000000..b85450338
--- /dev/null
+++ b/motioneye/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/10/05 22:12 UTC - [44fbe60](https://github.com/hassio-addons/addon-motioneye/commit/44fbe60e101b5301e47b15487cc85296c21ca33b) by [@frenck](https://github.com/frenck)
+> :books: Updates Docker status section in README 
+
diff --git a/motioneye/README.md b/motioneye/README.md
new file mode 100644
index 000000000..51f1cdf41
--- /dev/null
+++ b/motioneye/README.md
@@ -0,0 +1,53 @@
+# Community Hass.io Add-ons: motionEye
+
+[![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]
+
+Simple, elegant and feature-rich CCTV/NVR for your camera's.
+
+## About
+
+Lorem ipsum
+
+[Click here for the full documentation][docs]
+
+![HADashboard screenshot][screenshot]
+
+## 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-motioneye/blob/44fbe60/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-motioneye/41261?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.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-production%20ready-brightgreen.svg
+[release-shield]: https://img.shields.io/badge/version-44fbe60-blue.svg
+[release]: https://github.com/hassio-addons/addon-motioneye/tree/44fbe60
+[screenshot]: https://github.com/hassio-addons/addon-motioneye/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/motioneye/config.json b/motioneye/config.json
new file mode 100644
index 000000000..a738da295
--- /dev/null
+++ b/motioneye/config.json
@@ -0,0 +1,45 @@
+{
+  "name": "motionEye",
+  "version": "44fbe60",
+  "slug": "motioneye",
+  "description": "Simple, elegant and feature-rich CCTV/NVR for your camera's",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:8765]",
+  "startup": "application",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "hassio_role": "default",
+  "homeassistant_api": false,
+  "host_network": true,
+  "map": [
+    "config",
+    "share:rw",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "port": 8765,
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "ipv6": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "port": "port",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "ipv6": "bool"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/motioneye"
+}
\ No newline at end of file
diff --git a/motioneye/icon.png b/motioneye/icon.png
new file mode 100644
index 000000000..2507ebea7
Binary files /dev/null and b/motioneye/icon.png differ
diff --git a/motioneye/logo.png b/motioneye/logo.png
new file mode 100644
index 000000000..8fd0da217
Binary files /dev/null and b/motioneye/logo.png differ