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