diff --git a/data/hooks/backup/05-conf_ldap b/data/hooks/backup/05-conf_ldap
index 0a6cbc443..1e405e696 100644
--- a/data/hooks/backup/05-conf_ldap
+++ b/data/hooks/backup/05-conf_ldap
@@ -1,7 +1,15 @@
 backup_dir="$1/conf/ldap"
 mkdir -p $backup_dir
 
+# Fix for first jessie yunohost where slapd.conf is called slapd-yuno.conf
+# without slapcat doesn't work
+if [ ! -f /etc/ldap/slapd.conf ]
+then
+    sudo mv /etc/ldap/slapd-yuno.conf /etc/ldap/slapd.conf
+fi
+
 sudo cp -a /etc/ldap/slapd.conf $backup_dir/
+
 sudo slapcat -l $backup_dir/slapcat.ldif.raw
 egrep -v "^entryCSN:" < $backup_dir/slapcat.ldif.raw > $backup_dir/slapcat.ldif
 rm -f $backup_dir/slapcat.ldif.raw
diff --git a/data/hooks/backup/11-conf_mysql b/data/hooks/backup/11-conf_mysql
deleted file mode 100644
index d227df41d..000000000
--- a/data/hooks/backup/11-conf_mysql
+++ /dev/null
@@ -1,4 +0,0 @@
-backup_dir="$1/conf/mysql"
-mkdir -p $backup_dir
-
-mysqlpwd=$(sudo cat /etc/yunohost/mysql)
diff --git a/data/hooks/backup/11-conf_ynh_mysql b/data/hooks/backup/11-conf_ynh_mysql
new file mode 100644
index 000000000..e0cdc59ac
--- /dev/null
+++ b/data/hooks/backup/11-conf_ynh_mysql
@@ -0,0 +1,4 @@
+backup_dir="$1/conf/ynh/mysql"
+mkdir -p $backup_dir
+
+sudo cp -a /etc/yunohost/mysql $backup_dir/
diff --git a/data/hooks/restore/11-conf_mysql b/data/hooks/restore/11-conf_ynh_mysql
similarity index 58%
rename from data/hooks/restore/11-conf_mysql
rename to data/hooks/restore/11-conf_ynh_mysql
index cc1320298..bbea73fb1 100644
--- a/data/hooks/restore/11-conf_mysql
+++ b/data/hooks/restore/11-conf_ynh_mysql
@@ -1,5 +1,6 @@
-backup_dir="$1/conf/mysql"
+backup_dir="$1/conf/ynh/mysql"
 
 service mysql restart
+sudo cp -a $backup_dir/mysql /etc/yunohost/mysql
 mysqlpwd=$(sudo cat /etc/yunohost/mysql)
 sudo mysqladmin flush-privileges -p"$mysqlpwd"