diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d0822ec55..015e199f5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -140,4 +140,17 @@ jobs:
   - template: .azure-pipelines/addon-template.yml
     parameters:
       addon: 'transmission-openvpn'
+      arch: '--all'
+
+- job: 'jackett'
+  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: 'jackett'
       arch: '--all'
\ No newline at end of file
diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md
new file mode 100644
index 000000000..0a8453e0f
--- /dev/null
+++ b/jackett/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 0.1.0
+
+ - jackett 0.12.1635 (linuxserver/jackett:v0.12.1635-ls51)
\ No newline at end of file
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
new file mode 100644
index 000000000..01605649b
--- /dev/null
+++ b/jackett/Dockerfile
@@ -0,0 +1,10 @@
+FROM linuxserver/jackett:v0.12.1635-ls51
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/jackett|g" /etc/cont-init.d/30-config
+
+ENV XDG_DATA_HOME="/share/jackett" \
+XDG_CONFIG_HOME="/config/jackett"
+
+# copy local files
+COPY root/ /
\ No newline at end of file
diff --git a/jackett/README.md b/jackett/README.md
new file mode 100644
index 000000000..f0e45b640
--- /dev/null
+++ b/jackett/README.md
@@ -0,0 +1,26 @@
+# Hassio Add-ons by petersendev: jackett
+
+## About
+
+[Jackett](https://github.com/Jackett/Jackett) works as a proxy server: it translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-jackett) 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>:9117`.
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/jackett/config.json b/jackett/config.json
new file mode 100644
index 000000000..065a53752
--- /dev/null
+++ b/jackett/config.json
@@ -0,0 +1,45 @@
+{
+  "name": "jackett",
+  "version": "0.1.0",
+  "slug": "jackett",
+  "legacy": true,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-jackett",
+    "version_regex": "v(\\d+\\.\\d+\\.\\d+)-(ls\\d+)"
+  },
+  "description": "API Support for your favorite torrent trackers",
+  "url": "https://github.com/petersendev/hassio-addons/jackett",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf"
+  ],
+  "ports": {
+    "9117/tcp": 9117
+  },
+  "ports_description": {
+    "9117/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:9117]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "environment": {
+    "XDG_DATA_HOME": "/share/jackett",
+    "XDG_CONFIG_HOME": "/config/jackett"
+  },
+  "image": "petersendev/hassio-jackett-{arch}"
+}
diff --git a/jackett/icon.png b/jackett/icon.png
new file mode 100644
index 000000000..7fa9aa8e7
Binary files /dev/null and b/jackett/icon.png differ
diff --git a/jackett/logo.png b/jackett/logo.png
new file mode 100644
index 000000000..7fa9aa8e7
Binary files /dev/null and b/jackett/logo.png differ
diff --git a/jackett/root/etc/cont-init.d/20-folders b/jackett/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..916813cf5
--- /dev/null
+++ b/jackett/root/etc/cont-init.d/20-folders
@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /config/jackett ]; then
+  echo "Creating /config/jackett"
+  mkdir -p /config/jackett
+  chown -R abc:abc /config/jackett
+fi
+
+if [ ! -d /share/jackett ]; then
+  echo "Creating /share/jackett"
+  mkdir -p /share/jackett
+  chown -R abc:abc /share/jackett
+fi
\ No newline at end of file