diff --git a/README.md b/README.md
index d7b6d0b6..ed92f8c0 100644
--- a/README.md
+++ b/README.md
@@ -290,6 +290,20 @@ A secure and decentralized communication platform.
 
 [:books: Matrix add-on documentation][addon-doc-matrix]
 
+### ✓ [Nginx Proxy Manager][addon-nginxproxymanager]
+
+![Latest Version][nginxproxymanager-version-shield]
+![Supports armhf Architecture][nginxproxymanager-armhf-shield]
+![Supports armv7 Architecture][nginxproxymanager-armv7-shield]
+![Supports aarch64 Architecture][nginxproxymanager-aarch64-shield]
+![Supports amd64 Architecture][nginxproxymanager-amd64-shield]
+![Supports i386 Architecture][nginxproxymanager-i386-shield]
+![Docker Pulls][nginxproxymanager-pulls-shield]
+
+Manage Nginx proxy hosts with a simple, powerful interface
+
+[:books: Nginx Proxy Manager add-on documentation][addon-doc-nginxproxymanager]
+
 ### ✓ [Node-RED][addon-node-red]
 
 ![Latest Version][node-red-version-shield]
@@ -588,6 +602,7 @@ on the correct GitHub repository matching the add-on.
 - [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: Nginx Proxy Manager][nginxproxymanager-issue]
 - [Open an issue for the add-on: Node-RED][node-red-issue]
 - [Open an issue for the add-on: Phlex][phlex-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
@@ -835,6 +850,16 @@ SOFTWARE.
 [matrix-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [matrix-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [matrix-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-nginxproxymanager]: https://github.com/hassio-addons/addon-nginx-proxy-manager/tree/v0.1.0
+[addon-doc-nginxproxymanager]: https://github.com/hassio-addons/addon-nginx-proxy-manager/blob/v0.1.0/README.md
+[nginxproxymanager-issue]: https://github.com/hassio-addons/addon-nginx-proxy-manager/issues
+[nginxproxymanager-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[nginxproxymanager-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/nginxproxymanager-armhf.svg
+[nginxproxymanager-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[nginxproxymanager-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[nginxproxymanager-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[nginxproxymanager-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
+[nginxproxymanager-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v3.0.1
 [addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v3.0.1/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
diff --git a/nginxproxymanager/CHANGELOG.md b/nginxproxymanager/CHANGELOG.md
new file mode 100644
index 00000000..e28b3fc7
--- /dev/null
+++ b/nginxproxymanager/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial add-on release!
\ No newline at end of file
diff --git a/nginxproxymanager/README.md b/nginxproxymanager/README.md
new file mode 100644
index 00000000..e15753a8
--- /dev/null
+++ b/nginxproxymanager/README.md
@@ -0,0 +1,62 @@
+# Community Hass.io Add-ons: Nginx Proxy Manager
+
+[![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]
+
+Manage Nginx proxy hosts with a simple, powerful interface.
+
+## About
+
+This add-on enables you to easily forward incoming connections to anywhere,
+including free SSL, without having to know too much about Nginx
+or Let’s Encrypt.
+
+Forward your domain to your Home Assistant, Hass.io add-ons, or websites running
+at home or anywhere else, straight from a simple, powerful interface.
+
+Want to protect the website with a username/password? Well, it can do that too!
+Enable authentication and create a list of usernames/password that can access
+that specific application.
+
+For the power users, you can customize the behavior of each host in the
+Nginx proxy manager by providing additional Nginx directives.
+
+[Click here for the full documentation][docs]
+
+![Nginx Proxy Manager 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/frenck
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-nginx-proxy-manager/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-nginx-proxy-manager/111830?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.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-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-nginx-proxy-manager/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-nginx-proxy-manager/raw/master/images/screenshot.gif
\ No newline at end of file
diff --git a/nginxproxymanager/config.json b/nginxproxymanager/config.json
new file mode 100644
index 00000000..66edd229
--- /dev/null
+++ b/nginxproxymanager/config.json
@@ -0,0 +1,37 @@
+{
+  "name": "Nginx Proxy Manager",
+  "version": "0.1.0",
+  "slug": "nginxproxymanager",
+  "description": "Manage Nginx proxy hosts with a simple, powerful interface",
+  "url": "https://github.com/hassio-addons/addon-nginx-proxy-manager",
+  "webui": "http://[HOST]:[PORT:81]",
+  "startup": "application",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7",
+    "i386"
+  ],
+  "ports": {
+    "80": 80,
+    "81": 81,
+    "443": 443
+  },
+  "ports_description": {
+    "80": "HTTP Entrance port",
+    "81": "Proxy management web interface",
+    "443": "HTTPS/SSL Entrance port"
+  },
+  "boot": "auto",
+  "hassio_api": true,
+  "hassio_role": "default",
+  "map": [
+    "ssl:rw"
+  ],
+  "options": {},
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?"
+  },
+  "image": "hassioaddons/nginxproxymanager-{arch}"
+}
\ No newline at end of file
diff --git a/nginxproxymanager/icon.png b/nginxproxymanager/icon.png
new file mode 100644
index 00000000..c3c19c33
Binary files /dev/null and b/nginxproxymanager/icon.png differ
diff --git a/nginxproxymanager/logo.png b/nginxproxymanager/logo.png
new file mode 100644
index 00000000..a6691f63
Binary files /dev/null and b/nginxproxymanager/logo.png differ