diff --git a/manifest.json b/manifest.json
index 430bbe1..f7b7284 100644
--- a/manifest.json
+++ b/manifest.json
@@ -24,7 +24,7 @@
         "install" : [
             {
                 "name": "domain",
-		"type": "domain",
+                "type": "domain",
                 "ask": {
                     "en": "Choose a domain name for Monitorix",
                     "fr": "Choisissez un nom de domaine pour Monitorix"
@@ -33,7 +33,7 @@
             },
             {
                 "name": "path",
-		"type": "path",
+                "type": "path",
                 "ask": {
                     "en": "Choose a path for Monitorix",
                     "fr": "Choisissez un chemin pour Monitorix"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 33fb6db..1116aac 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -2,6 +2,7 @@
 
 ## Adapt md5sum while you update app
 md5sum="7314ad6fcd014a34c2e4e8a95455bcaa"
+monitorix_version="3.9.0"
 
 init_script() {
     # Exit on command errors and treat unset variables as an error
@@ -16,7 +17,7 @@ init_script() {
 
 get_source() {
 
-    wget -q -O '/tmp/monitorix.deb' 'http://www.monitorix.org/monitorix_3.9.0-izzy1_all.deb'
+    wget -q -O '/tmp/monitorix.deb' "http://www.monitorix.org/monitorix_${monitorix_version}-izzy1_all.deb"
 
     if [[ ! -e '/tmp/monitorix.deb' ]] || [[ $(md5sum '/tmp/monitorix.deb' | cut -d' ' -f1) != $md5sum ]]
     then
diff --git a/scripts/backup b/scripts/backup
index 8e20b24..be4abcc 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -36,3 +36,7 @@ ynh_backup "/etc/nginx/conf.d/monitorix_status.conf" "monitorix_status.conf"
 
 # Copy Monitorix configuration
 ynh_backup "/etc/monitorix" "config"
+
+# Copy Monitorix data
+ynh_backup "/var/lib/monitorix" "data"
+
diff --git a/scripts/install b/scripts/install
index 1d31bd0..d355554 100755
--- a/scripts/install
+++ b/scripts/install
@@ -35,10 +35,10 @@ ynh_app_setting_set "$app" mysqlpwd "$dbpass"
 ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass"
 
 # Find a port for built-in monitorix HTTP server
-FIND_PORT 8080
+NO_LOG FIND_PORT 8080
 http_port=$port
 ynh_app_setting_set $app http_port $http_port
-FIND_PORT $(($port +1))
+NO_LOG FIND_PORT $(($port +1))
 nginx_status_port=$port
 ynh_app_setting_set $app nginx_status_port $nginx_status_port
 
diff --git a/scripts/restore b/scripts/restore
index 26a0d44..e9600a1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -65,6 +65,7 @@ get_source
 ynh_package_update
 ynh_package_install rrdtool perl libwww-perl libmailtools-perl libmime-lite-perl librrds-perl libdbi-perl libxml-simple-perl libhttp-server-simple-perl libconfig-general-perl
 sudo dpkg -i /tmp/monitorix.deb
+sudo rm -rf /etc/monitorix/conf.d/00-debian.conf
 ynh_package_install -f
 
 # # Create and restore the database
@@ -79,7 +80,8 @@ sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 sudo cp -a ./monitorix_status.conf "/etc/nginx/conf.d/monitorix_status.conf"
 
 # Restore Monitorix configuration
-sudo cp -a ./config "/etc/monitorix"
+sudo cp -a ./config/. "/etc/monitorix/."
+sudo cp -a ./data/. "/var/lib/monitorix/."
 
 
 # Restart webserver