diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 83011fab1..a598e5424 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -88,4 +88,17 @@ jobs:
   - template: .azure-pipelines/addon-template.yml
     parameters:
       addon: 'sonarr'
+      arch: '--all'
+
+- job: 'radarr'
+  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: 'radarr'
       arch: '--all'
\ No newline at end of file
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
new file mode 100644
index 000000000..1892ff742
--- /dev/null
+++ b/radarr/Dockerfile
@@ -0,0 +1,8 @@
+FROM linuxserver/radarr:v0.2.0.1344-ls17
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/radarr|g" /etc/services.d/radarr/run \
+    && sed -i "s|/config|/config/radarr|g" /etc/cont-init.d/30-config
+
+# copy local files
+COPY root/ /
diff --git a/radarr/README.md b/radarr/README.md
new file mode 100644
index 000000000..d30b5c586
--- /dev/null
+++ b/radarr/README.md
@@ -0,0 +1,27 @@
+# Hassio Add-ons by petersendev: Radarr
+
+## About
+
+[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-radarr) 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>:7878`.
+
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/radarr/config.json b/radarr/config.json
new file mode 100644
index 000000000..8fed34802
--- /dev/null
+++ b/radarr/config.json
@@ -0,0 +1,37 @@
+{
+    "name": "radarr",
+    "version": "0.1.0",
+    "slug": "radarr",
+    "legacy": true,
+    "description": "A fork of Sonarr to work with movies à la Couchpotato",
+    "url": "https://github.com/petersendev/hassio-addons/radarr",
+    "startup": "services",
+    "arch": [
+      "aarch64",
+      "amd64",
+      "armhf"
+    ],
+    "ports": {
+      "7878/tcp": 7878
+    },
+    "ports_description": {
+      "7878/tcp": "web interface"
+    },
+    "map": [
+      "config:rw",
+      "share:rw",
+      "ssl"
+    ],
+    "webui": "http://[HOST]:[PORT:7878]",
+    "boot": "auto",
+    "options": {
+      "PUID": 1001,
+      "PGID": 1001
+    },
+    "schema": {
+      "PUID": "int",
+      "PGID": "int",
+      "TZ": "str?"
+    },
+    "image": "petersendev/hassio-radarr-{arch}"
+  }
\ No newline at end of file
diff --git a/radarr/icon.png b/radarr/icon.png
new file mode 100644
index 000000000..5e143b52e
Binary files /dev/null and b/radarr/icon.png differ
diff --git a/radarr/logo.png b/radarr/logo.png
new file mode 100644
index 000000000..5e143b52e
Binary files /dev/null and b/radarr/logo.png differ
diff --git a/radarr/root/etc/cont-init.d/20-folders b/radarr/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..9fcadd756
--- /dev/null
+++ b/radarr/root/etc/cont-init.d/20-folders
@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /share/storage/movies ]; then
+  echo "Creating /share/storage/movies"
+  mkdir -p /share/storage/movies
+  chown -R abc:abc /share/storage/movies
+fi
+
+if [ ! -d /share/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ ! -d /config/radarr ]; then
+  echo "Creating /config/radarr"
+  mkdir -p /config/radarr
+  chown -R abc:abc /config/radarr
+fi