diff --git a/README.md b/README.md
index 0af6fdfd9..99b579435 100644
--- a/README.md
+++ b/README.md
@@ -197,6 +197,19 @@ Create documents containing live code, equations, visualizations, and explanator
 
 [:books: Jupyter add-on documentation][addon-doc-jupyter]
 
+### ✓ [Node-RED][addon-node-red]
+
+![Latest Version][node-red-version-shield]
+![Supports armhf Architecture][node-red-armhf-shield]
+![Supports aarch64 Architecture][node-red-aarch64-shield]
+![Supports amd64 Architecture][node-red-amd64-shield]
+![Supports i386 Architecture][node-red-i386-shield]
+![Docker Pulls][node-red-pulls-shield]
+
+Flow-based programming for the Internet of Things
+
+[:books: Node-RED add-on documentation][addon-doc-node-red]
+
 ### ✓ [Pi-hole][addon-pi-hole]
 
 ![Latest Version][pi-hole-version-shield]
@@ -320,6 +333,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: IDE][ide-issue]
 - [Open an issue for the add-on: InfluxDB][influxdb-issue]
 - [Open an issue for the add-on: Jupyter][jupyter-issue]
+- [Open an issue for the add-on: Node-RED][node-red-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: Plex Media Server][plex-issue]
 - [Open an issue for the add-on: SSH - Secure Shell][ssh-issue]
@@ -484,6 +498,15 @@ SOFTWARE.
 [jupyter-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [jupyter-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [jupyter-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/2086044
+[addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/2086044/README.md
+[node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
+[node-red-version-shield]: https://img.shields.io/badge/version-2086044-blue.svg
+[node-red-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/node-red-armhf.svg
+[node-red-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[node-red-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[node-red-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[node-red-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/958905b
 [addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/958905b/README.md
 [pi-hole-issue]: https://github.com/hassio-addons/addon-pi-hole/issues
diff --git a/node-red/CHANGELOG.md b/node-red/CHANGELOG.md
new file mode 100644
index 000000000..ee8d4c5b4
--- /dev/null
+++ b/node-red/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/06/01 20:12 UTC - [2086044](https://github.com/hassio-addons/addon-node-red/commit/20860445804d61a3641de9f21c244ee05fb81f6e) by [@frenck](https://github.com/frenck)
+> :hammer: Simplification, reducing build times 
+
diff --git a/node-red/README.md b/node-red/README.md
new file mode 100644
index 000000000..99ca4367e
--- /dev/null
+++ b/node-red/README.md
@@ -0,0 +1,51 @@
+# Community Hass.io Add-ons: Example
+
+[![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]
+
+Flow-based programming for the Internet of Things.
+
+## About
+
+Node-RED is a programming tool for wiring together hardware devices,
+APIs and online services in new and interesting ways.
+
+It provides a browser-based editor that makes it easy to wire together flows
+using the wide range of nodes in the palette that can be deployed to its
+runtime in a single-click.
+
+[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>
+
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/?u=frenck
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[release-shield]: https://img.shields.io/badge/version-2086044-blue.svg
+[release]: https://github.com/hassio-addons/addon-node-red/tree/2086044
+[docs]: https://github.com/hassio-addons/addon-node-red/blob/2086044/README.md
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
\ No newline at end of file
diff --git a/node-red/config.json b/node-red/config.json
new file mode 100644
index 000000000..343e3f565
--- /dev/null
+++ b/node-red/config.json
@@ -0,0 +1,84 @@
+{
+  "name": "Node-RED",
+  "version": "2086044",
+  "slug": "nodered",
+  "description": "Flow-based programming for the Internet of Things",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "startup": "application",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": true,
+  "host_network": true,
+  "privileged": [],
+  "map": [
+    "config:rw",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "port": 1880,
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "require_ssl": true,
+    "users": [
+      {
+        "username": "MarryPoppins",
+        "password": "Supercalifragilisticexpialidocious",
+        "permissions": "*"
+      }
+    ],
+    "http_node": {
+      "username": "MarryPoppins",
+      "password": "Supercalifragilisticexpialidocious"
+    },
+    "http_static": {
+      "username": "MarryPoppins",
+      "password": "Supercalifragilisticexpialidocious"
+    },
+    "system_packages": [],
+    "node_packages": [],
+    "init_commands": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "port": "port",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "users": [
+      {
+        "username": "str",
+        "password": "str",
+        "permissions": "str"
+      }
+    ],
+    "http_node": {
+      "username": "str",
+      "password": "str"
+    },
+    "http_static": {
+      "username": "str",
+      "password": "str"
+    },
+    "system_packages": [
+      "str"
+    ],
+    "npm_packages": [
+      "str"
+    ],
+    "init_commands": [
+      "str"
+    ]
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/node-red-{arch}"
+}
\ No newline at end of file
diff --git a/node-red/icon.png b/node-red/icon.png
new file mode 100644
index 000000000..cd1d4e0ff
Binary files /dev/null and b/node-red/icon.png differ
diff --git a/node-red/logo.png b/node-red/logo.png
new file mode 100644
index 000000000..5604ab724
Binary files /dev/null and b/node-red/logo.png differ