diff --git a/README.md b/README.md
index a1b8ce53a..16713a419 100644
--- a/README.md
+++ b/README.md
@@ -340,6 +340,19 @@ Centrally manage all your Sonoff-Tasmota devices
 
 [:books: TasmoAdmin add-on documentation][addon-doc-tasmoadmin]
 
+### ✓ [Tautulli][addon-tautulli]
+
+![Latest Version][tautulli-version-shield]
+![Supports armhf Architecture][tautulli-armhf-shield]
+![Supports aarch64 Architecture][tautulli-aarch64-shield]
+![Supports amd64 Architecture][tautulli-amd64-shield]
+![Supports i386 Architecture][tautulli-i386-shield]
+![Docker Pulls][tautulli-pulls-shield]
+
+Monitoring and tracking tool for Plex Media Server
+
+[:books: Tautulli add-on documentation][addon-doc-tautulli]
+
 ### ✓ [Terminal][addon-terminal]
 
 ![Latest Version][terminal-version-shield]
@@ -422,6 +435,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 - [Open an issue for the add-on: Spotify Connect][spotify-issue]
 - [Open an issue for the add-on: TasmoAdmin][tasmoadmin-issue]
+- [Open an issue for the add-on: Tautulli][tautulli-issue]
 - [Open an issue for the add-on: Terminal][terminal-issue]
 - [Open an issue for the add-on: Tor][tor-issue]
 - [Open an issue for the add-on: UniFi Controller][unifi-issue]
@@ -681,6 +695,15 @@ SOFTWARE.
 [tasmoadmin-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tasmoadmin-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [tasmoadmin-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-tautulli]: https://github.com/hassio-addons/addon-tautulli/tree/d5b41cf
+[addon-doc-tautulli]: https://github.com/hassio-addons/addon-tautulli/blob/d5b41cf/README.md
+[tautulli-issue]: https://github.com/hassio-addons/addon-tautulli/issues
+[tautulli-version-shield]: https://img.shields.io/badge/version-d5b41cf-blue.svg
+[tautulli-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/tautulli.svg
+[tautulli-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[tautulli-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[tautulli-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[tautulli-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-terminal]: https://github.com/hassio-addons/addon-terminal/tree/7595a96
 [addon-doc-terminal]: https://github.com/hassio-addons/addon-terminal/blob/7595a96/README.md
 [terminal-issue]: https://github.com/hassio-addons/addon-terminal/issues
diff --git a/tautulli/CHANGELOG.md b/tautulli/CHANGELOG.md
new file mode 100644
index 000000000..1e2e20e5c
--- /dev/null
+++ b/tautulli/CHANGELOG.md
@@ -0,0 +1,13 @@
+2018/08/28 19:21 UTC - [d5b41cf](https://github.com/hassio-addons/addon-tautulli/commit/d5b41cf726e7d2b13baaa8f263ba3f603b1dc4a1) by [@ludeeus](https://github.com/ludeeus)
+> :shirt: Fixes linting issues for markdown and yaml (#2)
+
+* :shirt: fixes markdownlint
+
+* :shirt: linting fixes
+
+* Update .gitlab-ci.yml
+
+* linting
+
+* Rmoved slashes 
+
diff --git a/tautulli/README.md b/tautulli/README.md
new file mode 100644
index 000000000..e39919cd0
--- /dev/null
+++ b/tautulli/README.md
@@ -0,0 +1,53 @@
+# Community Hass.io Add-ons: Tautulli
+
+[![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]
+
+Monitoring and tracking tool for Plex Media Server.
+
+## About
+
+Tautulli is an application that you can run alongside your Plex Media Server
+to monitor activity, and track various statistics.
+Most importantly, these statistics include what has been watched,
+who watched it, when and where they watched it, and how it was watched.
+All statistics are presented in a nice and clean interface
+with many tables and graphs,
+which makes it easy to brag about your server to everyone else.
+
+[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/ludeeus
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-tautulli/blob/d5b41cf/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
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
+[release-shield]: https://img.shields.io/badge/version-d5b41cf-blue.svg
+[release]: https://github.com/hassio-addons/addon-tautulli/tree/d5b41cf
+[screenshot]: https://github.com/hassio-addons/addon-tautulli/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/tautulli/config.json b/tautulli/config.json
new file mode 100644
index 000000000..17665e936
--- /dev/null
+++ b/tautulli/config.json
@@ -0,0 +1,48 @@
+{
+  "name": "Tautulli",
+  "version": "d5b41cf",
+  "slug": "tautulli",
+  "description": "Monitoring and tracking tool for Plex Media Server",
+  "url": "https://github.com/hassio-addons/addon-tautulli/tree/master/README.md",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:8181]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "ports": {
+    "8181/tcp": 8181
+  },
+  "map": [
+    "config",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "username": "",
+    "password": "",
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "username": "str",
+    "password": "str",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "i_like_to_be_pwned": "bool?",
+    "leave_front_door_open": "bool?"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/tautulli"
+}
\ No newline at end of file
diff --git a/tautulli/icon.png b/tautulli/icon.png
new file mode 100644
index 000000000..cdeb13d59
Binary files /dev/null and b/tautulli/icon.png differ
diff --git a/tautulli/logo.png b/tautulli/logo.png
new file mode 100644
index 000000000..f2817f09e
Binary files /dev/null and b/tautulli/logo.png differ