diff --git a/check_process b/check_process
old mode 100755
new mode 100644
index 0602551..ed061d6
--- a/check_process
+++ b/check_process
@@ -44,7 +44,7 @@
 		# 2.0.5~ynh2
 		upgrade=1	from_commit=30696599937984e9879da22220253f005e290cd0
 		# 2.0.7~ynh1
-		upgrade=1	from_commit=e8a4a37c2fa35255d0ca3927df8da09e3c5829b6
+		upgrade=1	from_commit=e13745923a2e06e780e7b9d34ae084f600a9a2a2
 		backup_restore=1
 		multi_instance=0
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
@@ -80,5 +80,5 @@ Notification=yes
 		name=2.0.5~ynh1
 	; commit=30696599937984e9879da22220253f005e290cd0
 		name=2.0.5~ynh2
-	; commit=e8a4a37c2fa35255d0ca3927df8da09e3c5829b6
+	; commit=e13745923a2e06e780e7b9d34ae084f600a9a2a2
 		name=2.0.7~ynh1
diff --git a/manifest.json b/manifest.json
old mode 100755
new mode 100644
diff --git a/scripts/backup b/scripts/backup
index e0d7ef6..5fcb288 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -31,6 +31,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 cache=$(ynh_app_setting_get --app=$app --key=cache)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -75,6 +76,13 @@ ynh_print_info --message="Backing up the PostgreSQL database..."
 
 ynh_psql_dump_db --database="$db_name" > db.sql
 
+#=================================================
+# BACKUP THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Backing up data directory..."
+
+ynh_backup --src_path="$datadir" --is_big
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index f3b3455..3f49609 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,8 +109,16 @@ previous_version="${version}"
 #=================================================
 ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
 
+# Inform the backup/restore process that it should not save the data directory
+# Use only for the previous backup script that doesn't set 'is_big'
+ynh_app_setting_set --app=$app --key=backup_core_only --value=1
+
 # Backup the current version of the app
 ynh_backup_before_upgrade
+
+# Remove the option backup_core_only after the backup.
+ynh_app_setting_delete --app=$app --key=backup_core_only
+
 ynh_clean_setup () {
 	ynh_clean_check_starting
 	# restore it if the upgrade fails