diff --git a/manifest.json b/manifest.json
index f861f03..e914e05 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A simple, fast and flexible wiki.",
         "fr": "Un wiki simple, rapide et flexible."
     },
-    "version": "2.0~ynh1",
+    "version": "2.0~ynh2",
     "url": "http://chuwiki.genezys.net/",
     "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/backup b/scripts/backup
index 1251570..948f7b9 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -27,6 +27,7 @@ app=$YNH_APP_INSTANCE_NAME
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -43,7 +44,7 @@ ynh_backup --src_path="$final_path"
 # BACKUP CONTENT DIR
 #=================================================
 
-ynh_backup --src_path="/home/yunohost.app/$app"
+ynh_backup --src_path="$datadir" --is_big
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
diff --git a/scripts/install b/scripts/install
index a019eab..b5e5e78 100755
--- a/scripts/install
+++ b/scripts/install
@@ -89,14 +89,18 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 ynh_add_fpm_config
 
 #=================================================
-# CONTENT PATH CONFIGURATION
+# CREATE DATA DIRECTORY
 #=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
 
-content_path=/home/yunohost.app/$app
-mkdir -p $content_path
-ynh_app_setting_set --app=$app --key=content_path --value=$content_path
-chmod -R 750 $content_path
-chown -R $app $content_path
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+
+mkdir -p $datadir
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
 
 #=================================================
 # ADD A CONFIGURATION
diff --git a/scripts/restore b/scripts/restore
index fa1263d..7b51070 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,6 +28,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -67,12 +68,18 @@ chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
 #=================================================
-# RESTORE CONTENT DIR
+# RESTORE THE DATA DIRECTORY
 #=================================================
+ynh_script_progression --message="Restoring the data directory..." --time --weight=1
 
-ynh_restore_file --origin_path="/home/yunohost.app/$app"
-chmod -R 750 "/home/yunohost.app/$app"
-chown -R $app "/home/yunohost.app/$app"
+ynh_restore_file --origin_path="$datadir" --not_mandatory
+
+mkdir -p $datadir
+
+# this will be treated as a security issue.
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION