diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 7bdd01faec..9b49db3c7f 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-13  Ramon Novoa  <rnovoa@artica.es>
+
+	* win32/pandora_windows_service.cc: Brokers do not need to
+	  modify the path.
+
+	* win32/installer/pandora.mpi,
+	  win32/pandora.cc,
+	  unix/DEBIAN/control,
+	  unix/DEBIAN/make_deb_package.sh,
+	  unix/pandora_agent.spec,
+	  unix/pandora_agent: Updated version strings.
+
 2011-11-01  Junichi Satoh  <junichi@rworks.jp>
 
 	* android/res/values-ja/strings.xml: Updated the help text.
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5c4f90ba74..fd2e54ebcb 100755
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 4.0
+Version: final
 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 8edab3d8f2..7cf16feb96 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="4.0"
+pandora_version="final"
 
 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 2e9cfd7195..7c2c6ae2f6 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -52,8 +52,8 @@ if (!$@) {
 	threads::shared::share (\$Sem);
 }	
 
-use constant AGENT_VERSION => '4.0';
-use constant AGENT_BUILD => '111104';
+use constant AGENT_VERSION => 'final';
+use constant AGENT_BUILD => '111213';
 
 # Commands to retrieve total memory information in kB
 use constant TOTALMEMORY_CMDS => {
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index ded4be2c1c..c46fb41267 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     4.0
+%define version     final
 %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 abc1d8cd32..3c709ba741 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 v4.0}
+{Pandora FMS Windows Agent vfinal}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -75,7 +75,7 @@ InstallPassword
 {}
 
 InstallVersion
-{4.0.0.0}
+{final.0.0}
 
 Language,ca
 {No}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{110923}
+{111213}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f0810cccc1..12f0cee40e 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 ("4.0RC1(Build 110819)")
+#define PANDORA_VERSION ("final(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 946e882900..caa1714c48 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -125,15 +125,6 @@ Pandora_Windows_Service::pandora_init_broker (string file_conf) {
 	string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr;
 	int pos;
 
-	/*setPandoraDebug (true);*/
-
-	// Add the util subdirectory to the PATH
-	util_dir = Pandora::getPandoraInstallDir ();
-	util_dir += "util";
-	path = getenv ("PATH");
-	env = "PATH=" + path + ";" + util_dir;
-	putenv (env.c_str ());
-
 	name_agent = "PANDORA_AGENT=" + checkAgentName(file_conf);
 	putenv(name_agent.c_str());