diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 9b49db3c7f..48783564ce 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-13  Ramon Novoa  <rnovoa@artica.es>
+
+	* win32/installer/pandora.mpi,
+	  win32/pandora_windows_service.cc,
+	  win32/pandora.cc,
+	  unix/DEBIAN/control,
+	  unix/DEBIAN/make_deb_package.sh,
+	  unix/pandora_agent.spec,
+	  unix/pandora_agent: Fixed version strings (were wrong
+	  in the previous commit).
+
 2011-12-13  Ramon Novoa  <rnovoa@artica.es>
 
 	* win32/pandora_windows_service.cc: Brokers do not need to
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index fd2e54ebcb..af1e09fc24 100755
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: final
+Version: 4.0.1
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 7cf16feb96..791d471756 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="final"
+pandora_version="4.0.1"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 7c2c6ae2f6..fd1213bb53 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -52,7 +52,7 @@ if (!$@) {
 	threads::shared::share (\$Sem);
 }	
 
-use constant AGENT_VERSION => 'final';
+use constant AGENT_VERSION => '4.0.1';
 use constant AGENT_BUILD => '111213';
 
 # Commands to retrieve total memory information in kB
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index c46fb41267..1378fa26c1 100755
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,7 +2,7 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     final
+%define version     4.0.1
 %define release     1
 
 Summary:            Pandora FMS Linux agent, PERL version
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3c709ba741..72bee26d62 100755
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent vfinal}
+{Pandora FMS Windows Agent v4.0.1}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -75,7 +75,7 @@ InstallPassword
 {}
 
 InstallVersion
-{final.0.0}
+{4.0.0.0}
 
 Language,ca
 {No}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 12f0cee40e..a002eafb31 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("final(Build 111213)")
+#define PANDORA_VERSION ("4.0.1(Build 111213)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index caa1714c48..303aaab915 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -206,6 +206,7 @@ Pandora_Windows_Service::pandora_init () {
 	string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr;
 	string name_agent, name;
 	string proxy_mode, server_ip;
+	string *all_conf;
 	int pos, num;
 	static unsigned char first_run = 1;
                 
@@ -215,7 +216,7 @@ Pandora_Windows_Service::pandora_init () {
 	conf_file += "pandora_agent.conf";
 
 	num = count_broker_agents();
-	string all_conf[num];
+	all_conf = new string[num];
 	
 	this->conf = Pandora::Pandora_Agent_Conf::getInstance ();
 	this->conf->setFile (all_conf);
@@ -223,6 +224,7 @@ Pandora_Windows_Service::pandora_init () {
 		delete this->modules;
 	}
 	this->modules = new Pandora_Module_List (conf_file);
+	delete []all_conf;
 	
 	name = checkAgentName(conf_file);
 	if (name.empty ()) {
@@ -1455,7 +1457,7 @@ if (this->elapsed_transfer_time >= this->transfer_interval) {
 void
 Pandora_Windows_Service::pandora_run () {
 	Pandora_Agent_Conf  *conf = NULL;
-	string server_addr, conf_file;
+	string server_addr, conf_file, *all_conf;
     int startup_delay = 0;
     static unsigned char delayed = 0;
     int exe = 1;
@@ -1536,13 +1538,14 @@ Pandora_Windows_Service::pandora_run () {
 
 	/* Load and execute brokers */
 	num = count_broker_agents();
-	string all_conf[num];
+	all_conf = new string [num];
 	check_broker_agents(all_conf);
 	for (i=0;i<num;i++){
 		pandora_init_broker(all_conf[i]);
 		pandora_run_broker(all_conf[i]);
 	}
-
+	delete []all_conf;
+	
 	/* Reload the original configuration */
 	if (num != 0) {
 		pandora_init ();