diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8981d0e6e..a75f9a6e9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -62,4 +62,17 @@ jobs:
   - template: .azure-pipelines/addon-template.yml
     parameters:
       addon: 'hydra2'
+      arch: '--all'
+
+- job: 'nzbget'
+  condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('JQ'))
+  dependsOn:
+  - 'Hadolint'
+  - 'JQ'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - template: .azure-pipelines/addon-template.yml
+    parameters:
+      addon: 'nzbget'
       arch: '--all'
\ No newline at end of file
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
new file mode 100644
index 000000000..f8279e8ad
--- /dev/null
+++ b/nzbget/Dockerfile
@@ -0,0 +1,10 @@
+FROM linuxserver/nzbget:v21.0-ls15
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/nzbget|g" /etc/services.d/nzbget/run \
+    && sed -i "s|/config|/config/nzbget|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/downloads|/share/downloads|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/downloads|/share/downloads|g" /app/nzbget/share/nzbget/nzbget.conf
+
+# copy local files
+COPY root/ /
diff --git a/nzbget/README.md b/nzbget/README.md
new file mode 100644
index 000000000..260a669d6
--- /dev/null
+++ b/nzbget/README.md
@@ -0,0 +1,31 @@
+# Hassio Add-ons by petersendev: NZBGET
+
+## About
+
+[nzbget](http://nzbget.net/) is a usenet downloader, written in C++ and designed with performance in mind to achieve maximum download speed by using very little system resources.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-nzbget) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+
+## Configuration
+
+Webui can be found at `<your-ip>:6789`.
+
+The default login details (change ASAP) are
+
+`login`: nzbget, `password`: tegbzn6789
+
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/nzbget/config.json b/nzbget/config.json
new file mode 100644
index 000000000..2638d4a59
--- /dev/null
+++ b/nzbget/config.json
@@ -0,0 +1,33 @@
+{
+    "name": "nzbget",
+    "version": "0.0.4",
+    "slug": "nzbget",
+    "description": "Usenet downloader",
+    "url": "https://github.com/petersendev/hassio-addons/nzbget",
+    "startup": "services",
+    "arch": [
+      "aarch64",
+      "amd64",
+      "armhf"
+    ],
+    "ports": {
+      "6789/tcp": 6789
+    },
+    "ports_description": {
+      "6789/tcp": "web interface"
+    },
+    "map": [
+      "config:rw",
+      "share:rw",
+      "ssl"
+    ],
+    "webui": "http://[HOST]:[PORT:6789]",
+    "boot": "auto",
+    "environment": {
+      "PUID": "1000",
+      "PGID": "1000"
+    },
+    "options": {},
+    "schema": {},
+    "image": "petersendev/hassio-nzbget-{arch}"
+  }
\ No newline at end of file
diff --git a/nzbget/icon.png b/nzbget/icon.png
new file mode 100644
index 000000000..8f1166d55
Binary files /dev/null and b/nzbget/icon.png differ
diff --git a/nzbget/logo.png b/nzbget/logo.png
new file mode 100644
index 000000000..8f1166d55
Binary files /dev/null and b/nzbget/logo.png differ
diff --git a/nzbget/root/etc/cont-init.d/20-folders b/nzbget/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..10b6fae1f
--- /dev/null
+++ b/nzbget/root/etc/cont-init.d/20-folders
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+mkdir -p /share/downloads
+mkdir -p /config/nzbget
\ No newline at end of file