diff --git a/ChangeLog b/ChangeLog
index d8387c6a0e3..06ac1181c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,14 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 5.0.0 compared to 4.0.* *****
 
+WARNING: 
+
+Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
+* The hook getNodeList has been replaced by a normalized 'addreplace' hook getDirList.
+
+ 
 
 ***** ChangeLog for 5.0.0 compared to 4.0.* *****
 For users:
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 8f1e0110ec1..df5dafa43af 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -111,8 +111,9 @@ jQuery(document).ready(function() {
 <?php
 
 print load_fiche_titre($langs->trans("Backup"),'','title_setup');
+//print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
-print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
+print '<div class="center">'.$langs->trans("BackupDesc",DOL_DATA_ROOT).'</div><br><br>';
 
 ?>
 
@@ -121,7 +122,7 @@ print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
 	name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input
 	type="hidden" name="export_type" value="server" />
 
-<fieldset id="fieldsetexport"><legend style="font-size: 3em">1</legend>
+<fieldset id="fieldsetexport"><legend class="legendforfieldsetstep" style="font-size: 3em">1</legend>
 
 <?php
 print $langs->trans("BackupDesc3",$dolibarr_main_db_name).'<br>';
@@ -468,7 +469,7 @@ print '</td></tr></table>';
 ?>
 
 </div>
-<div id="backupdatabaseright" class="fichehalfright" style="height:400px; overflow: auto;">
+<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">
 <div class="ficheaddleft">
 
 <?php
@@ -484,7 +485,7 @@ print '<br>';
 
 <br>
 
-<fieldset><legend style="font-size: 3em">2</legend>
+<fieldset><legend class="legendforfieldsetstep" style="font-size: 3em">2</legend>
 <?php
 print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';
 print $langs->trans("BackupDescX").'<br><br>';
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 2456005428e..a4d84f008db 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -145,6 +145,7 @@ class HookManager
 			    'formatNotificationMessage',
 			    'getFormMail',
 			    'getIdProfUrl',
+			    'getDirList',
 				'moveUploadedFile',
 			    'pdf_build_address',
 				'pdf_writelinedesc',
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 3f1afa003a3..4e3cf7a0928 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -153,6 +153,7 @@ class Utils
 	{
 		global $db, $conf, $langs, $dolibarr_main_data_root;
 		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
+
 		
 		$langs->load("admin");
 		
@@ -405,6 +406,19 @@ class Utils
 		    $this->output = "";
 		    $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
 		}
+
+		// Clean old files
+		if ($keeplastnfiles > 0)
+		{
+		    $tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
+		    $i=0;
+		    foreach($tmpfiles as $key => $val)
+		    {
+		        $i++;
+		        if ($i <= $keeplastnfiles) continue;
+		        dol_delete_file($val['fullname']);
+		    }
+		}
 		
 		
 		return 0;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fa884d2d74a..2f248488afe 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -378,7 +378,7 @@ input:-webkit-autofill {
 input:-moz-placeholder { color:#ccc; }
 
 fieldset { border: 1px solid #AAAAAA !important; }
-
+.legendforfieldsetstep { padding-bottom: 10px; }
 
 .button, .buttonDelete, input[name="sbmtConnexion"] {
     font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e8439a7ab8c..ca1b6d2171c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -355,6 +355,7 @@ input:-webkit-autofill {
 input:-moz-placeholder { color:#ccc; }
 
 fieldset { border: 1px solid #AAAAAA !important; }
+.legendforfieldsetstep { padding-bottom: 10px; }
 
 
 .button, sbmtConnexion {