diff --git a/joal/Dockerfile b/joal/Dockerfile
new file mode 100644
index 000000000..15b753fd8
--- /dev/null
+++ b/joal/Dockerfile
@@ -0,0 +1,16 @@
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+
+RUN mkdir -p /joal \
+    &&  curl -L -s \
+        "https://github.com/anthonyraymond/joal/releases/download/2.1.24/joal.tar.gz" \
+        | tar zxvf - -C /joal \
+    && chown -R $(id -u):$(id -g) /joal \
+    && rm -fr \
+        /tmp/*
+
+VOLUME /data
+        
+CMD [ "--joal-conf=/joal" ]
+VOLUME [ "/data" ]
diff --git a/joal/README.md b/joal/README.md
new file mode 100644
index 000000000..0e4452159
--- /dev/null
+++ b/joal/README.md
@@ -0,0 +1,31 @@
+# Home assistant add-on: Joal
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+
+## About
+
+An open source command line RatioMaster with WebUI.
+This addon is based on the [docker image](https://hub.docker.com/r/anthonyraymond/joal) from Anthony Raymond.
+
+## 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. Make sure that the two ports are open on your router
+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>:8081/joal/ui`.
+You'll need to open the options and encode the secret token lrMY24Byhx
+
+[repository]: https://github.com/alexbelgium/hassio-addons
+[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
diff --git a/joal/build.json b/joal/build.json
new file mode 100644
index 000000000..3f1d76f0c
--- /dev/null
+++ b/joal/build.json
@@ -0,0 +1,11 @@
+{
+    "build_from": {
+        "armv7": "anthonyraymond/joal:2.1.24-arm",
+        "armhf": "anthonyraymond/joal:2.1.24-arm",
+        "aarch64": "anthonyraymond/joal:2.1.24-arm64",
+        "amd64": "anthonyraymond/joal:2.1.24-amd64"
+    },
+    "squash": false,
+    "args": {}
+}
+
diff --git a/joal/config.json b/joal/config.json
new file mode 100644
index 000000000..37e2c6a62
--- /dev/null
+++ b/joal/config.json
@@ -0,0 +1,36 @@
+{
+    "name": "Joal Desktop test",
+    "version": "2.1.24",
+    "slug": "joal",
+    "description": "An open source command line RatioMaster with WebUI",
+    "url": "https://github.com/alexbelgium/hassio-addons/tree/master/joal",
+    "startup": "services",
+    "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
+   "ports": {
+      "49152/tcp": 49152,
+      "8081/tcp": 8081
+    },
+   "ports_description": {
+      "49152/tcp": "torrent port - hardcoded, can't change",
+      "8081/tcp": "Web UI port - hardcoded, can't change"
+    },
+  "webui": "http://[HOST]:[PORT:8081]/joal/ui",
+  "boot": "auto", 
+  "host_network": true,
+  "environment": {
+  "spring.main.web-environment": true,
+  "joal.iframe.enabled":false,
+  "joal.ui.path.prefix": "joal",
+  "joal.ui.secret-token": "lrMY24Byhx",
+  "server.port": 8081
+  },
+  "options": {
+  },
+  "schema": {
+  }
+}
diff --git a/joal/icon.png b/joal/icon.png
new file mode 100644
index 000000000..63e97d080
Binary files /dev/null and b/joal/icon.png differ
diff --git a/joal/logo.png b/joal/logo.png
new file mode 100644
index 000000000..63e97d080
Binary files /dev/null and b/joal/logo.png differ