diff --git a/README.md b/README.md
index 169efbbec..517875dce 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,9 @@ https://github.com/alexbelgium/hassio-addons
 - Open source document management system (DMS)
 - Based on linuxserver image : https://hub.docker.com/r/linuxserver/papermerge
 
+### [Qbittorrent)](qbittorrent/)
+- Based on linuxserver image : https://hub.docker.com/r/linuxserver/qbittorrent
+
 ### [Radarr NAS](radarr/) <sub><i>stale</i></sub>
 - A fork of Sonarr to work with movies like Couchpotato	
 - Forked from : https://hub.docker.com/r/linuxserver/radarr
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
new file mode 100644
index 000000000..992c0988b
--- /dev/null
+++ b/qbittorrent/Dockerfile
@@ -0,0 +1,30 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+
+FROM ${BUILD_FROM}${BUILD_VERSION}
+
+# Add bashio
+RUN apt-get update && apt-get install -y \
+    curl \
+    jq \
+    && curl -J -L -o /tmp/bashio.tar.gz \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
+    \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -fr /tmp/bashio.tar.gz \
+    \
+    # Remove fixed folders
+    && sed '11,13d' /defaults/qBittorrent.conf \ 
+    # Allow connection to webUI
+    && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
+    && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf
+      
+# Copy root filesystem
+COPY rootfs /
+
+VOLUME [ "/data" "/config" ]
diff --git a/qbittorrent/README.md b/qbittorrent/README.md
new file mode 100644
index 000000000..ce67f68e1
--- /dev/null
+++ b/qbittorrent/README.md
@@ -0,0 +1,32 @@
+# Home assistant add-on: Qbittorrent
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+
+## About
+
+Transmission is a bittorrent client.
+This addon is based on the [docker image](https://github.com/linuxserver/qbittorrent) 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
+The webui is at <your-ip>:8081 and the default username/password is admin/adminadmin.
+  
+Options : 
+- "downloads": "/share/downloads"      # where the files will be saved after download
+- "temppath": "/share/incomplete"   # where the files are saved during download
+
+[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/qbittorrent/build.json b/qbittorrent/build.json
new file mode 100644
index 000000000..4abf170a3
--- /dev/null
+++ b/qbittorrent/build.json
@@ -0,0 +1,9 @@
+{
+    "build_from": {
+        "armv7": "linuxserver/qbittorrent:arm32v7-version-",
+        "armhf": "linuxserver/qbittorrent:arm32v7-version-",
+        "aarch64": "linuxserver/qbittorrent:arm64v8-version-",
+        "amd64": "linuxserver/qbittorrent:amd64-version-"
+    }
+}
+
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
new file mode 100644
index 000000000..3f404e2e2
--- /dev/null
+++ b/qbittorrent/config.json
@@ -0,0 +1,43 @@
+{
+    "name": "Qbittorrent",
+    "version": "14.3.3.99202101191832-7248-da0b276d5ubuntu18.04.1",
+    "slug": "qbittorrent",
+    "description": "A Qbittorrent container, brought to you by LinuxServer.io",
+    "url": "https://github.com/alexbelgium/hassio-addons/tree/master/qbittorrent",
+    "startup": "services",
+    "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
+   "ports": {
+      "8080/tcp": 8081,
+      "6881/tcp": 6881,
+      "6881/udp": 6881
+    },
+   "ports_description": {
+      "8080/tcp": "Web UI port",
+      "6881/tcp": "Peer port",
+      "6881/udp": "Peer port"
+    },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "media:rw"
+  ],
+  "webui": "http://[HOST]:[PORT:8080]",
+  "boot": "auto", 
+  "environment": {
+  "WEBUI_PORT": "8080"
+  },
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+	},
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  }
+}
diff --git a/qbittorrent/icon.png b/qbittorrent/icon.png
new file mode 100644
index 000000000..29a6a3cdc
Binary files /dev/null and b/qbittorrent/icon.png differ
diff --git a/qbittorrent/logo.png b/qbittorrent/logo.png
new file mode 100644
index 000000000..29a6a3cdc
Binary files /dev/null and b/qbittorrent/logo.png differ
diff --git a/qbittorrent/rootfs/etc/cont-init.d/50-configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/50-configuration.sh
new file mode 100644
index 000000000..8900e2ff5
--- /dev/null
+++ b/qbittorrent/rootfs/etc/cont-init.d/50-configuration.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bashio
+
+bashio::log.info "Default username/password : admin/adminadmin"