diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index cd805ad9f2..212cd0af1c 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-08  Ramon Novoa  <rnovoa@artica.es>
+
+	* unix/DEBIAN/control, unix/DEBIAN/make_deb_package.sh,
+	  unix/pandora_agent.spec, unix/pandora_agent,
+	  win32/installer/pandora.mpi, win32/pandora.cc: Updated version
+	  strings.
+
 2010-06-07  Junichi Satoh  <junichi@rworks.jp>
 
 	* unix/pandora_agent_installer: Added support for FreeBSD.
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index be01befda0..00a11e90f7 100755
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: PandoraFMS-Agent-Unix
-Version: 3.1rc1
+Version: 3.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 36b04570b9..1c86b2c061 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="3.1rc1"
+pandora_version="3.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 10200d446a..a9d14a2b30 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -29,8 +29,8 @@ use Sys::Hostname;
 use File::Basename;
 use File::Copy;
 
-use constant AGENT_VERSION => '3.1rc1';
-use constant AGENT_BUILD => '100222';
+use constant AGENT_VERSION => '3.1';
+use constant AGENT_BUILD => '100608';
 
 # 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 c7da5b5507..8a19f3b4a0 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     3.1rc1
+%define version     3.1
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
 Version:            %{version}
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 36a95434de..58fd521cd2 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 v3.1RC1}
+{Pandora FMS Windows Agent v3.1}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ccd3ab48bc..f6686e769b 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 ("3.1RC1(Build 100519)")
+#define PANDORA_VERSION ("3.1(Build 100608)")
 
 string pandora_path;
 string pandora_dir;