diff --git a/conf/settings.json b/conf/settings.json
index 72b062b..36808fc 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -66,5 +66,7 @@
     "upload-limit": 100,
     "upload-limit-enabled": 0,
     "upload-slots-per-torrent": 14,
-    "utp-enabled": true
+    "utp-enabled": true,
+    "watch-dir": "/home/yunohost.transmission/watched",
+    "watch-dir-enabled": true
 }
diff --git a/scripts/install b/scripts/install
index 0a19aa3..84e54d3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -38,21 +38,24 @@ sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
 sudo apt-get install transmission-daemon -y -qq
 
 # Make directories and set rights
-sudo mkdir -p /home/yunohost.transmission/{progress,completed}
+sudo mkdir -p /home/yunohost.transmission/{progress,completed,watched}
 sudo chown -R debian-transmission:www-data /home/yunohost.transmission/
-sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress
+sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress /home/yunohost.transmission/watched
 sudo find /home/yunohost.transmission/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
 sudo find /home/yunohost.transmission/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
+sudo find /home/yunohost.transmission/watched -type d | while read LINE; do sudo chmod 770 "$LINE" ; done
+ynh_app_setting_set "$app" watchdir "/home/yunohost.transmission/watched"
 
 # Create RPC password
 rpcpassword=$(ynh_string_random)
 ynh_app_setting_set "$app" rpcpassword "$rpcpassword"
 
 # Configure Transmission and reload
+sudo service transmission-daemon stop
 sed -i "s@RPCPASSWORDTOCHANGE@$rpcpassword@g" ../conf/settings.json
 sed -i "s@PATHTOCHANGE@$path@g" ../conf/settings.json
 sudo cp ../conf/settings.json /etc/transmission-daemon/settings.json
-sudo service transmission-daemon reload
+sudo service transmission-daemon start
 
 # Monitor service
 sudo yunohost service add transmission-daemon
diff --git a/scripts/restore b/scripts/restore
index a940637..e482564 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -53,11 +53,12 @@ sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
 sudo apt-get install transmission-daemon -y -qq
 
 # Make directories and set rights
-sudo mkdir -p /home/yunohost.transmission/{progress,completed}
+sudo mkdir -p /home/yunohost.transmission/{progress,completed,watched}
 sudo chown -R debian-transmission:www-data /home/yunohost.transmission/
-sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress
+sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress /home/yunohost.transmission/watched
 sudo find /home/yunohost.transmission/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
 sudo find /home/yunohost.transmission/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
+sudo find /home/yunohost.transmission/watched -type d | while read LINE; do sudo chmod 770 "$LINE" ; done
 
 # Reload transmission service
 sudo service transmission-daemon reload
diff --git a/scripts/upgrade b/scripts/upgrade
index 51131be..a447713 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,6 +13,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get "$app" domain)
 path=$(ynh_app_setting_get "$app" path)
 rpcpassword=$(ynh_app_setting_get "$app" rpcpassword)
+watchdir=$(ynh_app_setting_get "$app" watchdir)
 
 # Remove trailing "/" for next commands
 path=${path%/}
@@ -24,11 +25,16 @@ sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
 sudo apt-get install transmission-daemon -y -qq
 
 # Make directories and set rights
-sudo mkdir -p /home/yunohost.transmission/{progress,completed}
+sudo mkdir -p /home/yunohost.transmission/{progress,completed,watched}
 sudo chown -R debian-transmission:www-data /home/yunohost.transmission/
-sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress
+sudo chown -R debian-transmission:debian-transmission /home/yunohost.transmission/progress /home/yunohost.transmission/watched
 sudo find /home/yunohost.transmission/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
 sudo find /home/yunohost.transmission/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
+sudo find /home/yunohost.transmission/watched -type d | while read LINE; do sudo chmod 770 "$LINE" ; done
+# Add watchdir in settings if it does not exist yet (previous versions)
+if [ -z "$watchdir" ]; then
+    ynh_app_setting_set "$app" watchdir "/home/yunohost.transmission/watched"
+fi
 
 # Create RPC password if none exists
 if [ -z "$rpcpassword" ]; then
@@ -37,10 +43,11 @@ if [ -z "$rpcpassword" ]; then
 fi
 
 # Configure Transmission and reload
+sudo service transmission-daemon stop
 sed -i "s@RPCPASSWORDTOCHANGE@$rpcpassword@g" ../conf/settings.json
 sed -i "s@PATHTOCHANGE@$path@g" ../conf/settings.json
 sudo cp ../conf/settings.json /etc/transmission-daemon/settings.json
-sudo service transmission-daemon reload
+sudo service transmission-daemon start
 
 # Patch sources to add a download button
 if ! grep 'toolbar-downloads' /usr/share/transmission/web/index.html --quiet; then