diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index bdf8cd919c..151ac39dec 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-23 Sancho Lerena <slerena@artica.es>
+
+	* util/pandora_db.pl: Fixed bug when a blank space was behind
+	the data in the .conf file.
+
+	* util/pandora_diagnostic.sh,
+	util/pandora_db.pl,
+	util/pandora_manage.pl,
+	util/pandora_dbstress.pl: Updated version strings.
+
 2011-09-23 Sancho Lerena <slerena@artica.es>
 
 	* lib/PandoraFMS/Config.pm: Updated version.
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cb631d102e..4aa65bd096 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -371,7 +371,7 @@ sub pandora_load_config ($) {
 	open (CFG, '< ' . $conf->{'_pandora_path'}) or die ("[ERROR] Could not open configuration file: $!\n");
 	while (my $line = <CFG>){
 		next unless ($line =~ /^(\S+)\s+(.*)\s+$/);
-		$conf->{$1} = $2;
+		$conf->{$1} =  clean_blank($2);
 	}
  	close (CFG);
 
diff --git a/pandora_server/util/pandora_dbstress.pl b/pandora_server/util/pandora_dbstress.pl
index 09355bc1fe..c91b74acfb 100755
--- a/pandora_server/util/pandora_dbstress.pl
+++ b/pandora_server/util/pandora_dbstress.pl
@@ -45,7 +45,7 @@ use PandoraFMS::Core;
 ################################################################################
 ################################################################################
 
-my $version = "3.0 PS091214";
+my $version = "4.0 PS110923";
 
 # FLUSH in each IO (only for debug, very slooow)
 # ENABLED in DEBUGMODE
diff --git a/pandora_server/util/pandora_diagnostic.sh b/pandora_server/util/pandora_diagnostic.sh
index 580fbb90d9..b0b214c8c7 100755
--- a/pandora_server/util/pandora_diagnostic.sh
+++ b/pandora_server/util/pandora_diagnostic.sh
@@ -12,7 +12,7 @@ LINUXINFO=`uname -a`
 OUTFILE="/tmp/pandora_diag.$TIMESTAMP.data"
 
 echo " "
-echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009"
+echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009-2011"
 echo "http://pandorafms.org. This script is licensed under GPL2 terms"                   
 echo " "
 echo "Please wait while this script is collecting data"
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c091d8b11d..76a136d953 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -26,7 +26,7 @@ use PandoraFMS::Core;
 use PandoraFMS::Config;
 
 # version: define current version
-my $version = "3.2 PS101014";
+my $version = "4.0 PS110923";
 
 # Parameter
 my $param;