diff --git a/README.md b/README.md
index 554003dce..7f2414850 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,19 @@ Network-wide ad blocking using your Hass.io instance
 
 [:books: Pi-hole add-on documentation][addon-doc-pi-hole]
 
+### ✓ [Shinobi Pro][addon-shinobi]
+
+![Latest Version][shinobi-version-shield]
+![Supports armhf Architecture][shinobi-armhf-shield]
+![Supports aarch64 Architecture][shinobi-aarch64-shield]
+![Supports amd64 Architecture][shinobi-amd64-shield]
+![Supports i386 Architecture][shinobi-i386-shield]
+![Docker Pulls][shinobi-pulls-shield]
+
+Beautiful and feature-rich CCTV/NVR for your cameras
+
+[:books: Shinobi Pro add-on documentation][addon-doc-shinobi]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -187,6 +200,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Homebridge][homebridge-issue]
 - [Open an issue for the add-on: IDE][ide-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
+- [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -317,6 +331,15 @@ SOFTWARE.
 [pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [pi-hole-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [pi-hole-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-shinobi]: https://github.com/hassio-addons/addon-shinobi/tree/v0.1.0
+[addon-doc-shinobi]: https://github.com/hassio-addons/addon-shinobi/blob/v0.1.0/README.md
+[shinobi-issue]: https://github.com/hassio-addons/addon-shinobi/issues
+[shinobi-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[shinobi-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/shinobi-armhf.svg
+[shinobi-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[shinobi-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[shinobi-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[shinobi-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/shinobi/CHANGELOG.md b/shinobi/CHANGELOG.md
new file mode 100644
index 000000000..8e10269df
--- /dev/null
+++ b/shinobi/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial release
\ No newline at end of file
diff --git a/shinobi/config.json b/shinobi/config.json
new file mode 100644
index 000000000..2fc2dbda5
--- /dev/null
+++ b/shinobi/config.json
@@ -0,0 +1,68 @@
+{
+  "name": "Shinobi Pro",
+  "version": "0.1.0",
+  "slug": "shinobi",
+  "description": "Beautiful and feature-rich CCTV/NVR for your cameras",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-shinobi-pro/49767?u=frenck",
+  "webui": "http://[HOST]:[PORT:5000]",
+  "startup": "application",
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "ports": {
+    "80/tcp": 5000,
+    "443/tcp": 5443
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "super_username": "admin@shinobi.video",
+    "super_password": "admin",
+    "mysql": false,
+    "mysql_host": "core-mariadb",
+    "mysql_username": "shinobi",
+    "mysql_password": "sh1n0b1",
+    "mysql_database": "shinobi",
+    "mysql_port": 3306,
+    "mail_service": "gmail",
+    "mail_username": "your_email@gmail.com",
+    "mail_password": "your_password",
+    "mail_host": "smtp.example.com",
+    "mail_port": 587,
+    "mail_secure": false,
+    "mail_cert_verify": true,
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "super_username": "email",
+    "super_password": "str",
+    "mysql": "bool",
+    "mysql_host": "str",
+    "mysql_username": "str",
+    "mysql_password": "str",
+    "mysql_database": "str",
+    "mysql_port": "port",
+    "mail_service": "match(^(gmail|smtp)$)",
+    "mail_username": "str",
+    "mail_password": "str",
+    "mail_host": "str",
+    "mail_port": "port",
+    "mail_secure": "bool",
+    "mail_cert_verify": "bool",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/shinobi-{arch}"
+}
\ No newline at end of file
diff --git a/shinobi/icon.png b/shinobi/icon.png
new file mode 100644
index 000000000..661af8164
Binary files /dev/null and b/shinobi/icon.png differ
diff --git a/shinobi/logo.png b/shinobi/logo.png
new file mode 100644
index 000000000..506db4fee
Binary files /dev/null and b/shinobi/logo.png differ