diff --git a/scripts/install b/scripts/install
index 1c5df672..64f12c62 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,11 +66,7 @@ ynh_app_setting_set $app database $database
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt" 
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
 
 #=================================================
 # CREATE A MYSQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index 7c7bc9cf..986691bc 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -83,12 +83,7 @@ ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt"
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
 
 #=================================================
 # RESTORE THE CRON FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0ab63319..13caed40 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -125,11 +125,11 @@ ynh_use_logrotate  "$final_path/php.log" --non-append
 sed -i "s@YNH_WWW_PATH@$final_path@g" ../conf/poller-cron
 sudo cp ../conf/poller-cron /etc/cron.d/$app
 
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt"
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
+
 
 # Make app public
 ynh_app_setting_set $app skipped_uris "/"