diff --git a/data/hooks/backup/50-conf_manually_modified_files b/data/hooks/backup/50-conf_manually_modified_files
new file mode 100644
index 000000000..e7217bda6
--- /dev/null
+++ b/data/hooks/backup/50-conf_manually_modified_files
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+source /usr/share/yunohost/helpers
+ynh_abort_if_errors
+YNH_CWD="${YNH_BACKUP_DIR%/}/conf/manually_modified_files"
+mkdir -p "$YNH_CWD"
+cd "$YNH_CWD"
+
+yunohost tools shell -c "from yunohost.regenconf import manually_modified_files; print('\n'.join(manually_modified_files()))" > ./manually_modified_files_list
+
+ynh_backup --src_path="./manually_modified_files_list"
+
+for file in $(cat ./manually_modified_files_list)
+do
+    ynh_backup --src_path="$file"
+done
diff --git a/data/hooks/restore/50-conf_manually_modified_files b/data/hooks/restore/50-conf_manually_modified_files
new file mode 100644
index 000000000..a6c5bc26a
--- /dev/null
+++ b/data/hooks/restore/50-conf_manually_modified_files
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+source /usr/share/yunohost/helpers
+ynh_abort_if_errors
+YNH_CWD="${YNH_BACKUP_DIR%/}/conf/manually_modified_files"
+cd "$YNH_CWD"
+
+for file in $(cat ./manually_modified_files_list)
+do
+    ynh_restore_file --origin_path="$file" --not_mandatory
+done