diff --git a/README.md b/README.md
index e96fb0461..05944d79b 100644
--- a/README.md
+++ b/README.md
@@ -587,6 +587,20 @@ Fully featured VSCode experience, to edit your HA config in the browser, includi
 
 [:books: Visual Studio Code add-on documentation][addon-doc-vscode]
 
+### ✓ [Z-Wave to MQTT][addon-zwave2mqtt]
+
+![Latest Version][zwave2mqtt-version-shield]
+![Supports armhf Architecture][zwave2mqtt-armhf-shield]
+![Supports armv7 Architecture][zwave2mqtt-armv7-shield]
+![Supports aarch64 Architecture][zwave2mqtt-aarch64-shield]
+![Supports amd64 Architecture][zwave2mqtt-amd64-shield]
+![Supports i386 Architecture][zwave2mqtt-i386-shield]
+![Docker Pulls][zwave2mqtt-pulls-shield]
+
+Fully configurable Z-Wave to MQTT gateway and control panel
+
+[:books: Z-Wave to MQTT add-on documentation][addon-doc-zwave2mqtt]
+
 ### ✓ [ZeroTier One][addon-zerotier]
 
 ![Latest Version][zerotier-version-shield]
@@ -688,6 +702,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Traccar][traccar-issue]
 - [Open an issue for the add-on: UniFi Controller][unifi-issue]
 - [Open an issue for the add-on: Visual Studio Code][vscode-issue]
+- [Open an issue for the add-on: Z-Wave to MQTT][zwave2mqtt-issue]
 - [Open an issue for the add-on: ZeroTier One][zerotier-issue]
 - [Open an issue for the add-on: chrony][chrony-issue]
 - [Open an issue for the add-on: motionEye][motioneye-issue]
@@ -1130,6 +1145,16 @@ SOFTWARE.
 [vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
+[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/5e7ec18
+[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/5e7ec18/README.md
+[zwave2mqtt-issue]: https://github.com/hassio-addons/addon-zwave2mqtt/issues
+[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-5e7ec18-blue.svg
+[zwave2mqtt-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/zwave2mqtt-armhf.svg
+[zwave2mqtt-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[zwave2mqtt-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[zwave2mqtt-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[zwave2mqtt-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
+[zwave2mqtt-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-zerotier]: https://github.com/hassio-addons/addon-zerotier/tree/cc291a4
 [addon-doc-zerotier]: https://github.com/hassio-addons/addon-zerotier/blob/cc291a4/README.md
 [zerotier-issue]: https://github.com/hassio-addons/addon-zerotier/issues
diff --git a/zwave2mqtt/CHANGELOG.md b/zwave2mqtt/CHANGELOG.md
new file mode 100644
index 000000000..74d82cf60
--- /dev/null
+++ b/zwave2mqtt/CHANGELOG.md
@@ -0,0 +1,3 @@
+2019/05/09 20:18 UTC - [5e7ec18](https://github.com/hassio-addons/addon-zwave2mqtt/commit/5e7ec184fdf5c6999dde3d4bca07a9b3793a95c4) by [@frenck](https://github.com/frenck)
+> :art: Adds logo & icon 
+
diff --git a/zwave2mqtt/README.md b/zwave2mqtt/README.md
new file mode 100644
index 000000000..0c4381278
--- /dev/null
+++ b/zwave2mqtt/README.md
@@ -0,0 +1,63 @@
+# Community Hass.io Add-ons: Z-Wave to MQTT
+
+[![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]
+
+Fully configurable Z-Wave to MQTT gateway and control panel.
+
+## About
+
+The Z-Wave to MQTT add-on allows you to decouple your Z-Wave network from
+your Home Assistant instance by leveraging your MQTT broker. It ships with
+a web-based control panel, allowing you to configure every aspect of your
+Z-Wave network and how they are published in MQTT.
+
+Some advantages and use-cases for this are:
+
+- Your Z-Wave network will keep running between Home Assistant restarts.
+- You can directly use things like Node-RED with your Z-Wave network, while
+  it is available for Home Assistant at the same time.
+- Allow [ESPHome.io][esphome] based ESP devices to directly respond or work
+  with your Z-Wave network.
+
+[Click here for the full documentation][docs]
+
+## 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-zwave2mqtt/blob/5e7ec18/README.md
+[esphome]: https://esphome.io/components/mqtt.html#on-message-trigger
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.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-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-5e7ec18-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/5e7ec18
+[screenshot]: https://github.com/hassio-addons/addon-zwave2mqtt/raw/master/images/screenshot.gif
\ No newline at end of file
diff --git a/zwave2mqtt/config.json b/zwave2mqtt/config.json
new file mode 100644
index 000000000..2f32b71e2
--- /dev/null
+++ b/zwave2mqtt/config.json
@@ -0,0 +1,45 @@
+{
+  "name": "Z-Wave to MQTT",
+  "version": "5e7ec18",
+  "slug": "zwave2mqtt",
+  "description": "Fully configurable Z-Wave to MQTT gateway and control panel",
+  "url": "https://github.com/hassio-addons/addon-zwave2mqtt",
+  "webui": "http://[HOST]:[PORT:8091]",
+  "startup": "system",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7",
+    "i386"
+  ],
+  "ports": {
+    "8091/tcp": 8091
+  },
+  "ports_description": {
+    "8091/tcp": "Z-Wave to MQTT Control Panel"
+  },
+  "boot": "auto",
+  "auth_api": true,
+  "hassio_api": true,
+  "hassio_role": "default",
+  "auto_uart": true,
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl:rw"
+  ],
+  "options": {
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "leave_front_door_open": "bool?"
+  },
+  "image": "hassioaddons/zwave2mqtt-{arch}"
+}
\ No newline at end of file
diff --git a/zwave2mqtt/icon.png b/zwave2mqtt/icon.png
new file mode 100644
index 000000000..b20420c55
Binary files /dev/null and b/zwave2mqtt/icon.png differ
diff --git a/zwave2mqtt/logo.png b/zwave2mqtt/logo.png
new file mode 100644
index 000000000..d360338b8
Binary files /dev/null and b/zwave2mqtt/logo.png differ