diff --git a/Dockerfiles/deluge/Dockerfile b/Dockerfiles/deluge/Dockerfile
new file mode 100644
index 0000000..1c9b675
--- /dev/null
+++ b/Dockerfiles/deluge/Dockerfile
@@ -0,0 +1,16 @@
+FROM buildpack-deps:xenial-scm
+MAINTAINER Jean Froment <froment.je@gmail.com>
+
+RUN apt-get update; apt-get install -y \
+    deluged \
+    deluge-web
+
+ADD entrypoint.sh /opt/entrypoint.sh
+RUN chmod a+x /opt/entrypoint.sh
+
+VOLUME /config
+VOLUME /torrents
+
+EXPOSE 8112 58846 53160 53160/udp
+
+CMD ["/opt/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfiles/deluge/entrypoint.sh b/Dockerfiles/deluge/entrypoint.sh
new file mode 100644
index 0000000..50b6a8b
--- /dev/null
+++ b/Dockerfiles/deluge/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -f /config/deluged.pid
+
+mkdir -p /config/deluge
+
+deluged -c /config/deluge -L info -l /config/deluge/deluged.log
+deluge-web -c /config/deluge
\ No newline at end of file
diff --git a/Dockerfiles/frontend/nginx.conf b/Dockerfiles/frontend/nginx.conf
index 2f12f6d..9da35e4 100644
--- a/Dockerfiles/frontend/nginx.conf
+++ b/Dockerfiles/frontend/nginx.conf
@@ -47,6 +47,16 @@ http {
         }
     }
 
+    server {
+        include common.conf;
+        server_name ~^(deluge)(\.\w+)+$;
+
+        location / {
+            set $deluge http://deluge:8112;
+            proxy_pass $deluge;
+        }
+    }
+
     server {
         include common.conf;
         server_name ~^(plex)(\.\w+)+$;
diff --git a/build-all.sh b/build-all.sh
index ea3b262..a285f59 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -25,6 +25,7 @@ done
 docker build -t fromenje/seedbox:frontend  $ARGS Dockerfiles/frontend  &
 docker build -t fromenje/seedbox:plex      $ARGS Dockerfiles/plex      &
 docker build -t fromenje/seedbox:rtorrent  $ARGS Dockerfiles/rtorrent  &
+docker build -t fromenje/seedbox:deluge    $ARGS Dockerfiles/deluge    &
 docker build -t fromenje/seedbox:sonarr	   $ARGS Dockerfiles/sonarr	   &
 
 wait
diff --git a/docker-compose.yml b/docker-compose.yml
index 022edd2..98e4349 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,21 @@ services:
             - config:/config
             - torrents:/torrents
 
+    deluge:
+        image: fromenje/seedbox:deluge
+        build: Dockerfiles/deluge
+        restart: always
+        networks:
+            - main
+        ports:
+            - "8112:8112"
+            - "58846:58846"
+        volumes:
+            - torrents:/torrents
+            - config:/config
+        env_file:
+            - config
+
     plex:
         image: fromenje/seedbox:plex
         build: Dockerfiles/plex