diff --git a/README.md b/README.md
index a4a87249..8c992ecb 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,19 @@ Network-wide ad blocking using your Hass.io instance
 
 [:books: Pi-hole add-on documentation][addon-doc-pi-hole]
 
+### ✓ [Plex Media Server][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 Media Server add-on documentation][addon-doc-plex]
+
 ### ✓ [SSH - Secure Shell][addon-ssh]
 
 ![Latest Version][ssh-version-shield]
@@ -271,6 +284,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Homebridge][homebridge-issue]
 - [Open an issue for the add-on: IDE][ide-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]
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 - [Open an issue for the add-on: SonWEB][sonweb-issue]
@@ -415,6 +429,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/v0.1.0
+[addon-doc-plex]: https://github.com/hassio-addons/addon-plex/blob/v0.1.0/README.md
+[plex-issue]: https://github.com/hassio-addons/addon-plex/issues
+[plex-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[plex-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/plex-armhf.svg
+[plex-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[plex-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[plex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v2.4.0
 [addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v2.4.0/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 00000000..be787ead
--- /dev/null
+++ b/plex/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial release!
\ No newline at end of file
diff --git a/plex/README.md b/plex/README.md
new file mode 100644
index 00000000..46056550
--- /dev/null
+++ b/plex/README.md
@@ -0,0 +1,47 @@
+# Community Hass.io Add-ons: Plex Media Server
+
+[![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 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/frenck
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-plex/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-plex-media-server/54383?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.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-plex/tree/v0.1.0
\ No newline at end of file
diff --git a/plex/config.json b/plex/config.json
new file mode 100644
index 00000000..5113fb68
--- /dev/null
+++ b/plex/config.json
@@ -0,0 +1,51 @@
+{
+  "name": "Plex Media Server",
+  "version": "0.1.0",
+  "slug": "plex",
+  "description": "Recorded media, live TV, online news, and podcasts ready to stream.",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-plex-media-server/54383?u=frenck",
+  "webui": "http://[HOST]:[PORT:32400]/web",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "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,
+    "33400/tcp": 33400,
+    "33443/tcp": 33443
+  },
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "options": {
+    "log_level": "info",
+    "claim_code": "",
+    "webtools": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "claim_code": "str",
+    "webtools": "bool"
+  },
+  "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 00000000..061922ad
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 00000000..13998fab
Binary files /dev/null and b/plex/logo.png differ