diff --git a/README.md b/README.md
index 1166f7a82..ffa98ee8b 100644
--- a/README.md
+++ b/README.md
@@ -262,6 +262,19 @@ Mosquitto MQTT Server bundled with Hivemq's web client
 
 [:books: MQTT Server & Web client add-on documentation][addon-doc-mqtt]
 
+### ✓ [Matrix][addon-matrix]
+
+![Latest Version][matrix-version-shield]
+![Supports armhf Architecture][matrix-armhf-shield]
+![Supports aarch64 Architecture][matrix-aarch64-shield]
+![Supports amd64 Architecture][matrix-amd64-shield]
+![Supports i386 Architecture][matrix-i386-shield]
+![Docker Pulls][matrix-pulls-shield]
+
+A secure and decentralized communication platform.
+
+[:books: Matrix add-on documentation][addon-doc-matrix]
+
 ### ✓ [Network UPS Tools][addon-nut]
 
 ![Latest Version][nut-version-shield]
@@ -507,6 +520,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Lovelace Migration][lovelace-migration-issue]
 - [Open an issue for the add-on: Lutron Certificate][lutron-cert-issue]
 - [Open an issue for the add-on: MQTT Server & Web client][mqtt-issue]
+- [Open an issue for the add-on: Matrix][matrix-issue]
 - [Open an issue for the add-on: Network UPS Tools][nut-issue]
 - [Open an issue for the add-on: Node-RED][node-red-issue]
 - [Open an issue for the add-on: Octobox][octobox-issue]
@@ -725,6 +739,15 @@ SOFTWARE.
 [mqtt-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [mqtt-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [mqtt-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/c392a40
+[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/c392a40/README.md
+[matrix-issue]: https://github.com/hassio-addons/addon-matrix/issues
+[matrix-version-shield]: https://img.shields.io/badge/version-c392a40-blue.svg
+[matrix-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/matrix.svg
+[matrix-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[matrix-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[matrix-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[matrix-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-nut]: https://github.com/hassio-addons/addon-nut/tree/c1c2ef6
 [addon-doc-nut]: https://github.com/hassio-addons/addon-nut/blob/c1c2ef6/README.md
 [nut-issue]: https://github.com/hassio-addons/addon-nut/issues
diff --git a/matrix/CHANGELOG.md b/matrix/CHANGELOG.md
new file mode 100644
index 000000000..a4cd0b1f7
--- /dev/null
+++ b/matrix/CHANGELOG.md
@@ -0,0 +1,9 @@
+2018/12/20 22:39 UTC - [c392a40](https://github.com/hassio-addons/addon-matrix/commit/c392a400e536a658dfe2b3d41f7e56757d25c9d6) by [@timmo001](https://github.com/timmo001)
+> Update docs (#7)
+
+* :books: Update links to author
+
+* :books: fix bad link
+
+* :books: update docker section 
+
diff --git a/matrix/README.md b/matrix/README.md
new file mode 100644
index 000000000..641081e61
--- /dev/null
+++ b/matrix/README.md
@@ -0,0 +1,56 @@
+# Community Hass.io Add-ons: Matrix
+
+[![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]
+
+A secure, decentralized communication platform.
+
+## About
+
+Matrix is a secure and decentralized communication platform served as an
+ in-house and open-source alternative for platfoms like Discord or Slack. You
+ can connect via your own [client][clients], or via the built-in web client.
+
+[Click here for the full documentation][docs]
+
+![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/timmo
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-matrix/blob/c392a40/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io
+[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-c392a40-blue.svg
+[release]: https://github.com/hassio-addons/addon-matrix/tree/c392a40
+[screenshot]: https://github.com/hassio-addons/addon-matrix/raw/master/images/screenshot.png
+[clients]: https://matrix.org/docs/projects/try-matrix-now.html
\ No newline at end of file
diff --git a/matrix/config.json b/matrix/config.json
new file mode 100644
index 000000000..7d4440f05
--- /dev/null
+++ b/matrix/config.json
@@ -0,0 +1,44 @@
+{
+  "name": "Matrix",
+  "version": "c392a40",
+  "slug": "matrix",
+  "description": "A secure and decentralized communication platform.",
+  "url": "https://community.home-assistant.io",
+  "webui": "http://[HOST]:[PORT:8448]",
+  "startup": "application",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_role": "default",
+  "host_network": false,
+  "ports": {
+    "8448/tcp": 8448
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "server_name": "hassio.local"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "server_name": "str"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/matrix"
+}
\ No newline at end of file
diff --git a/matrix/icon.png b/matrix/icon.png
new file mode 100644
index 000000000..e507be267
Binary files /dev/null and b/matrix/icon.png differ
diff --git a/matrix/logo.png b/matrix/logo.png
new file mode 100644
index 000000000..9c8da1b59
Binary files /dev/null and b/matrix/logo.png differ