diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 808a43fe45..9cdd7d7de9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,16 @@
+2012-06-21  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandoradb_data.sql,
+	  DEBIAN/control,
+	  DEBIAN/make_deb_package.sh,
+	  include/config_process.php,
+	  install.php,
+	  pandora_console.spec,
+	  pandora_console.redhat.spec: Updated version strings.
+
+	* extensions/update_manager.php: Merged from 4.0 branch. Ignore blank
+	  lines in installation SQL file.
+
 2012-06-21 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* extensions/update_manager/load_updatemanager.php: fixed the lost
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3ea90d0e9a..9739165b11 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 4.0.1
+Version: 5.0dev
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 19bcf06d15..2a4c118049 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/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.1"
+pandora_version="5.0dev"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php
index 1d27557515..6c6e0d28de 100644
--- a/pandora_console/extensions/update_manager.php
+++ b/pandora_console/extensions/update_manager.php
@@ -111,6 +111,8 @@ function pandora_update_manager_install () {
 			break;
 	}
 	foreach ($sentences as $sentence) {
+		if (trim ($sentence) == "")
+			continue;
 		$success = db_process_sql ($sentence);
 		if ($success === false)
 			return;
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 12f1851c1e..cc73d8314e 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,8 +22,8 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC120214';
-$pandora_version = 'v5.0-dev';
+$build_version = 'PC120621';
+$pandora_version = 'v5.0dev';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b6b45a74eb..6691ec3da8 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -66,8 +66,8 @@ function ChangeDBAction(causer) {
 
 <?php
 
-$version = '5.0';
-$build = '120418';
+$version = '5.0dev';
+$build = '120621';
 $banner = "v$version Build $build";
 
 error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 4e273d29cc..d36526a5bf 100755
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,7 +2,7 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     4.0
+%define version     5.0dev
 %define release     1
 
 %define httpd_name      httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 890670d130..82e9112941 100755
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,7 +2,7 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     4.0.1
+%define version     5.0dev
 %define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 07d8120ac5..98b4fb0494 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -48,8 +48,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('days_compact','0'),
 ('graph_res','5'),
 ('step_compact','1'),
-('db_scheme_version','5.0'),
-('db_scheme_build','PD120524'),
+('db_scheme_version','5.0dev'),
+('db_scheme_build','PD120621'),
 ('show_unknown','0'),
 ('show_lastalerts','1'),
 ('style','pandora'),