diff --git a/README.md b/README.md
index c82f436e..736426f4 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,19 @@ Beautiful and feature-rich CCTV/NVR for your cameras
 
 [:books: Shinobi Pro add-on documentation][addon-doc-shinobi]
 
+### ✓ [SonWEB][addon-sonweb]
+
+![Latest Version][sonweb-version-shield]
+![Supports armhf Architecture][sonweb-armhf-shield]
+![Supports aarch64 Architecture][sonweb-aarch64-shield]
+![Supports amd64 Architecture][sonweb-amd64-shield]
+![Supports i386 Architecture][sonweb-i386-shield]
+![Docker Pulls][sonweb-pulls-shield]
+
+Centrally manage all your Sonoff-Tasmota devices
+
+[:books: SonWEB add-on documentation][addon-doc-sonweb]
+
 ### ✓ [Terminal][addon-terminal]
 
 ![Latest Version][terminal-version-shield]
@@ -260,6 +273,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: SSH - Secure Shell][ssh-issue]
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
+- [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]
 
@@ -419,6 +433,15 @@ SOFTWARE.
 [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
+[addon-sonweb]: https://github.com/hassio-addons/addon-sonweb/tree/v0.1.0
+[addon-doc-sonweb]: https://github.com/hassio-addons/addon-sonweb/blob/v0.1.0/README.md
+[sonweb-issue]: https://github.com/hassio-addons/addon-sonweb/issues
+[sonweb-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[sonweb-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sonweb-armhf.svg
+[sonweb-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[sonweb-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[sonweb-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[sonweb-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-terminal]: https://github.com/hassio-addons/addon-terminal/tree/v2.4.0
 [addon-doc-terminal]: https://github.com/hassio-addons/addon-terminal/blob/v2.4.0/README.md
 [terminal-issue]: https://github.com/hassio-addons/addon-terminal/issues
diff --git a/sonweb/CHANGELOG.md b/sonweb/CHANGELOG.md
new file mode 100644
index 00000000..be787ead
--- /dev/null
+++ b/sonweb/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial release!
\ No newline at end of file
diff --git a/sonweb/README.md b/sonweb/README.md
new file mode 100644
index 00000000..645bd1e5
--- /dev/null
+++ b/sonweb/README.md
@@ -0,0 +1,53 @@
+# Community Hass.io Add-ons: SonWEB
+
+[![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]
+
+Centrally manage all your Sonoff-Tasmota devices.
+
+## About
+
+SonWEB is an administrative web interface to manage all your Sonoff-Tasmota
+flashed devices centrally. Some of its features:
+
+- Scans your networks and adds your devices automatically
+- See the status off all your devices quick and easy
+- Configure all your devices from a single place
+- Send out firmware updates over the air to one or more your devices at once
+- Can automatically download the latest firmware for you
+
+[Click here for the full documentation][docs]
+
+![SonWEB screenshot][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-sonweb/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-sonweb/54155?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-sonweb/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-sonweb/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/sonweb/config.json b/sonweb/config.json
new file mode 100644
index 00000000..a218d3a5
--- /dev/null
+++ b/sonweb/config.json
@@ -0,0 +1,41 @@
+{
+  "name": "SonWEB",
+  "version": "0.1.0",
+  "slug": "sonweb",
+  "description": "Centrally manage all your Sonoff-Tasmota devices",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:9541]",
+  "startup": "system",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "map": [
+    "ssl"
+  ],
+  "ports": {
+    "9541/tcp": 9541
+  },
+  "options": {
+    "log_level": "info",
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "ipv6": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "ipv6": "bool"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/sonweb-{arch}"
+}
\ No newline at end of file
diff --git a/sonweb/icon.png b/sonweb/icon.png
new file mode 100644
index 00000000..ce94a957
Binary files /dev/null and b/sonweb/icon.png differ
diff --git a/sonweb/logo.png b/sonweb/logo.png
new file mode 100644
index 00000000..1b7526a7
Binary files /dev/null and b/sonweb/logo.png differ