diff --git a/README.md b/README.md
index f75dc89c9..d97f8f0ec 100644
--- a/README.md
+++ b/README.md
@@ -184,6 +184,19 @@ Network-wide ad blocking using your Hass.io instance
 
 [:books: Pi-hole add-on documentation][addon-doc-pi-hole]
 
+### ✓ [Plex][addon-plex]
+
+![Latest Version][plex-version-shield]
+![Supports armhf Architecture][plex-armhf-shield]
+![Supports aarch64 Architecture][plex-aarch64-shield]
+![Supports amd64 Architecture][plex-amd64-shield]
+![Supports i386 Architecture][plex-i386-shield]
+![Docker Pulls][plex-pulls-shield]
+
+Recorded media, live TV, online news, and podcasts ready to stream.
+
+[:books: Plex add-on documentation][addon-doc-plex]
+
 ### ✓ [SSH - Secure Shell][addon-ssh]
 
 ![Latest Version][ssh-version-shield]
@@ -267,6 +280,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: Jupyter][jupyter-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
+- [Open an issue for the add-on: Plex][plex-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: Terminal][terminal-issue]
@@ -419,6 +433,15 @@ SOFTWARE.
 [pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [pi-hole-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [pi-hole-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-plex]: https://github.com/hassio-addons/addon-plex/tree/7b7dece
+[addon-doc-plex]: https://github.com/hassio-addons/addon-plex/blob/7b7dece/README.md
+[plex-issue]: https://github.com/hassio-addons/addon-plex/issues
+[plex-version-shield]: https://img.shields.io/badge/version-7b7dece-blue.svg
+[plex-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/plex-amd64.svg
+[plex-aarch64-shield]: https://img.shields.io/badge/aarch64-no-red.svg
+[plex-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[plex-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
+[plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/9e03230
 [addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/9e03230/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md
new file mode 100644
index 000000000..87e39b4da
--- /dev/null
+++ b/plex/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/05/21 10:19 UTC - [7b7dece](https://github.com/hassio-addons/addon-plex/commit/7b7dece1b1c2a568a4685374207645d17657820a) by [@frenck](https://github.com/frenck)
+> :sparkles: Adds initial add-on code 
+
diff --git a/plex/README.md b/plex/README.md
new file mode 100644
index 000000000..c8a5d260b
--- /dev/null
+++ b/plex/README.md
@@ -0,0 +1,50 @@
+# Community Hass.io Add-ons: Plex
+
+[![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]
+
+Your recorded media, live TV, online news, and podcasts, beautifully organized
+and ready to stream.
+
+## About
+
+The plex add-on brings your favorite media together in one place, making it
+beautiful and easy to enjoy. The Plex Media Server provided by this addon,
+organizes your personal video, music, and photo collections
+and streams them to all of your devices.
+
+[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/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-plex/blob/7b7dece/README.md
+[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/2018.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-concept-red.svg
+[release-shield]: https://img.shields.io/badge/version-7b7dece-blue.svg
+[release]: https://github.com/hassio-addons/addon-plex/tree/7b7dece
\ No newline at end of file
diff --git a/plex/config.json b/plex/config.json
new file mode 100644
index 000000000..769bf5334
--- /dev/null
+++ b/plex/config.json
@@ -0,0 +1,43 @@
+{
+  "name": "Plex",
+  "version": "7b7dece",
+  "slug": "plex",
+  "description": "Recorded media, live TV, online news, and podcasts ready to stream.",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "webui": "http://[HOST]:[PORT:32400]/web",
+  "startup": "services",
+  "arch": [
+    "amd64",
+    "i386"
+  ],
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "boot": "auto",
+  "ports": {
+    "1900/udp": 1900,
+    "3005/tcp": 3005,
+    "8324/tcp": 8324,
+    "32400/tcp": 32400,
+    "32410/udp": 32410,
+    "32412/udp": 32412,
+    "32413/udp": 32413,
+    "32414/udp": 32414,
+    "32469/tcp": 32469
+  },
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": true,
+  "options": {
+    "log_level": "info"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/plex-{arch}"
+}
\ No newline at end of file
diff --git a/plex/icon.png b/plex/icon.png
new file mode 100644
index 000000000..061922ad4
Binary files /dev/null and b/plex/icon.png differ
diff --git a/plex/logo.png b/plex/logo.png
new file mode 100644
index 000000000..13998fab7
Binary files /dev/null and b/plex/logo.png differ