diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index afecfa3153..cf935c6916 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-30  Sancho Lerena <slerena@gmail.com>
+
+	* lib/PandoraFMS/DB.pm:  Some people reports problems with 
+	server stop detection. This could help, because has optimized
+	way to detect servers, but is not a bugfix because I cannot 
+	reproduce the problem.
+
+	* Config.pm: Updated version.
+
+	* server/Launcher scripts: Updated version.
+
 2008-10-22  Evi Vanoost  <vanooste@rcbi.rochester.edu>
 
 	* bin/pandora_snmpconsole: Feature request #2166257
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4370e9ae17..afccab7e11 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -38,8 +38,8 @@ our @EXPORT = qw(
 # There is no global vars, all variables (setup) passed as hash reference
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "2.0";
-my $pandora_build="PS081014";
+my $pandora_version = "2.1-dev";
+my $pandora_build="PS081030";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 6b6bd4ec6c..8829810c3e 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -1302,7 +1302,8 @@ sub pandora_serverkeepaliver (%$$) {
 		$temp = $pa_config->{"keepalive_orig"} * 2; # Down if keepalive x 2 seconds unknown
 		my $fecha_limite = DateCalc($timestamp,"- $temp seconds",\$err);
 		$fecha_limite = &UnixDate($fecha_limite,"%Y-%m-%d %H:%M:%S");
-		my $query_idag = "SELECT * FROM tserver WHERE keepalive < '$fecha_limite'";
+		
+		my $query_idag = "SELECT * FROM tserver WHERE status = 1 AND keepalive < '$fecha_limite'";
 		my $s_idag = $dbh->prepare($query_idag);
 		$s_idag ->execute;
 		if ($s_idag->rows != 0) {
@@ -1313,19 +1314,16 @@ sub pandora_serverkeepaliver (%$$) {
 					my $sql_update = "UPDATE tserver SET status = 0, version = '".$version_data."' WHERE id_server = $data[0]";
 					$dbh->do($sql_update);
 
-
-					pandora_event ($pa_config, "Server ".$data[1]." going Down", 0,
-								   0, 4, 0, 0, "system", $dbh);
-
-					logger( $pa_config, "Server ".$data[1]." going Down ",1);
+					pandora_event ($pa_config, "Server ".$data[1]." going Down", 0, 0, 4, 0, 0, "system", $dbh);
+					logger( $pa_config, "Server ".$data[1]." going Down ", 1);
 				}
 			}
 		}
 		$s_idag->finish();
-		# Update my server
 		$pa_config->{"keepalive"} = $pa_config->{"keepalive_orig"};
+	} else {
+		$pa_config->{"keepalive"} = $pa_config->{"keepalive"} - $pa_config->{"server_threshold"};
 	}
-	$pa_config->{"keepalive"} = $pa_config->{"keepalive"} - $pa_config->{"server_threshold"};
 }
 
 ##########################################################################
diff --git a/pandora_server/pandora_network b/pandora_server/pandora_network
index bf0ed27bad..1c6cf6aa8a 100755
--- a/pandora_server/pandora_network
+++ b/pandora_server/pandora_network
@@ -3,7 +3,7 @@
 # Pandora FMS Network Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -64,6 +64,7 @@ case "$1" in
 			;;
 	force-reload|restart)
 		$0 stop
+		sleep 2
 		$0 start
 		;;
 	*)
diff --git a/pandora_server/pandora_plugin b/pandora_server/pandora_plugin
index 1406679454..5b73a49543 100755
--- a/pandora_server/pandora_plugin
+++ b/pandora_server/pandora_plugin
@@ -3,7 +3,7 @@
 # Pandora FMS Plugin Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -62,6 +62,7 @@ case "$1" in
 	        ;;
 	force-reload|restart)
 		$0 stop
+		sleep 2
 		$0 start
 		;;
 	*)
diff --git a/pandora_server/pandora_prediction b/pandora_server/pandora_prediction
index 30e7db87d9..22eb9c6d27 100755
--- a/pandora_server/pandora_prediction
+++ b/pandora_server/pandora_prediction
@@ -3,7 +3,7 @@
 # Pandora FMS Prediction Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -64,6 +64,7 @@ case "$1" in
         ;;
   force-reload|restart)
         $0 stop
+		sleep 2
         $0 start
         ;;
   *)
diff --git a/pandora_server/pandora_recon b/pandora_server/pandora_recon
index f9ced05a2d..b9f4d00dbe 100755
--- a/pandora_server/pandora_recon
+++ b/pandora_server/pandora_recon
@@ -3,7 +3,7 @@
 # Pandora FMS Recon Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -62,6 +62,7 @@ case "$1" in
         ;;
   force-reload|restart)
         $0 stop
+		sleep 2
         $0 start
         ;;
   *)
diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server
index db73b225a7..58090a129e 100755
--- a/pandora_server/pandora_server
+++ b/pandora_server/pandora_server
@@ -3,7 +3,7 @@
 # Pandora FMS Data Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -64,6 +64,7 @@ case "$1" in
 		;;
   force-reload|restart)
 		$0 stop
+		sleep 2
 		$0 start
 		;;
   *)
diff --git a/pandora_server/pandora_wmi b/pandora_server/pandora_wmi
index fabd50701f..00d918afc1 100755
--- a/pandora_server/pandora_wmi
+++ b/pandora_server/pandora_wmi
@@ -3,7 +3,7 @@
 # Pandora FMS WMI Server, startup script
 # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
 # Linux Version (generic)
-# v2.0 Build 080903
+# v2.1 Build 081030
 # http://www.pandorafms.com
 
 # Configurable path and filenames
@@ -62,6 +62,7 @@ case "$1" in
 			;;
 	force-reload|restart)
 		$0 stop
+		sleep 2
 		$0 start
 		;;
 	*)