diff --git a/README.md b/README.md
index eb892450..01d1d0bd 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,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]
+
 ### ✓ [Node-RED][addon-node-red]
 
 ![Latest Version][node-red-version-shield]
@@ -457,6 +470,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: Node-RED][node-red-issue]
 - [Open an issue for the add-on: Octobox][octobox-issue]
 - [Open an issue for the add-on: Phlex][phlex-issue]
@@ -647,6 +661,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/v0.1.0
+[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.1.0/README.md
+[matrix-issue]: https://github.com/hassio-addons/addon-matrix/issues
+[matrix-version-shield]: https://img.shields.io/badge/version-v0.1.0-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-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v1.2.2
 [addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v1.2.2/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
diff --git a/matrix/CHANGELOG.md b/matrix/CHANGELOG.md
new file mode 100644
index 00000000..57699e61
--- /dev/null
+++ b/matrix/CHANGELOG.md
@@ -0,0 +1 @@
+First release :sparkles: 
\ No newline at end of file
diff --git a/matrix/README.md b/matrix/README.md
new file mode 100644
index 00000000..973fa6b3
--- /dev/null
+++ b/matrix/README.md
@@ -0,0 +1,50 @@
+# 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]
+
+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 [clients][clients], or via the Riot web client
+ provided from this add-on.
+
+[Click here for the full documentation][docs]
+
+![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/timmo
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-matrix/blob/v0.1.0/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/2019.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-matrix/tree/v0.1.0
+[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 00000000..b888bcb8
--- /dev/null
+++ b/matrix/config.json
@@ -0,0 +1,46 @@
+{
+  "name": "Matrix",
+  "version": "0.1.0",
+  "slug": "matrix",
+  "description": "A secure and decentralized communication platform.",
+  "url": "https://community.home-assistant.io",
+  "webui": "http://[HOST]:[PORT:8558]",
+  "startup": "application",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "hassio_role": "default",
+  "host_network": false,
+  "ports": {
+    "8448/tcp": 8448,
+    "8558/tcp": 8558
+  },
+  "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 00000000..30b80ec5
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 00000000..2beb651d
Binary files /dev/null and b/matrix/logo.png differ