diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 558638ccf9..2b2964d78c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-13  Sancho Lerena <slerena@artica.es>
 
+	* util/pandora_server: Incremented shutting down grace time to 60 secs
+	because in some systems could take a lot of time to close all threads.
+
+	* conf/pandora_server.conf: Better defaults for Pandora FMS server default 
+	install. 
+
+	* Config.pm: Hey, this is officially RC1....
+
 	* pandora_server_installer: Fixed usage of old pathnames /usr/share/pandora
 	Fixed name of pandora_db cron.daily entry.
 	
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index f8bdcfcfbd..c8b17f32e6 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -9,7 +9,7 @@
 # if not given, it takes hostname. It's preferable to setup one
 # because machine name could change by some reason.
 
-#servername endor
+#servername adama
 
 # incomingdir:  Defines directory where incoming data packets are stored
 # You could set directory relative to base path or absolute, starting with /
@@ -82,24 +82,24 @@ dataserver 1
 reconserver 1
 
 # pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup
-
-pluginserver 1
+# DISABLED BY DEFAULT
+pluginserver 0 
 
 # Pandora FMS Plugin exec tool filepath (by default at /usr/local/bin)
 
 plugin_exec /usr/local/bin/pandora_exec
 
 # predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
-
-predictionserver 1
+# DISABLED BY DEFAULT 
+predictionserver 0
 
 # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
-
-wmiserver 1
+# DISABLED BY DEFAULT
+wmiserver 0
 
 # Network timeout (in seconds) for timeout in network connections for Network agents
 
-network_timeout 3
+network_timeout 2
 
 # Server keepalive (in seconds)
 
@@ -107,7 +107,7 @@ server_keepalive 45
 
 # Server Threshold: defines number of seconds of main loop (in sec)
 
-server_threshold 5
+server_threshold 1
 
 # Network threads: Do not set too high (~40). Each threads make a network module check.
 
@@ -116,7 +116,7 @@ network_threads 5
 # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of 
 # that ping should be 1 to report 1
 
-icmp_checks 2
+icmp_checks 1
 
 # tcp specific options :
 # tcp_checks: number of tcp retries if first attempt fails.
@@ -223,3 +223,7 @@ max_queue_files 250
 # Use the XML file last modification time as timestamp.
 # use_xml_timestamp 1
 
+# Pandora FMS will autorestart itself each XXX seconds, use this if you experience problems with 
+# shutting down threads, or other stability problems.
+
+# auto_restart 86400 
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 67059c45da..623f46a672 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -36,8 +36,8 @@ our @EXPORT = qw(
     );
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "3.0-dev";
-my $pandora_build = "PS090928";
+my $pandora_version = "3.0RC1";
+my $pandora_build = "PS091013";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/util/pandora_server b/pandora_server/util/pandora_server
index 88b310e7af..52a8ffffa0 100755
--- a/pandora_server/util/pandora_server
+++ b/pandora_server/util/pandora_server
@@ -89,12 +89,12 @@ case "$1" in
 			kill $PANDORA_PID > /dev/null 2>&1
 			COUNTER=0
 
-	                while [  $COUNTER -lt 10 ]
+	                while [  $COUNTER -lt 60 ]
              		do
                         	PANDORA_PID=`pidof_pandora`
                         	if [ -z "$PANDORA_PID" ]
  		                then
-                                	COUNTER=10
+                                	COUNTER=60
                         	fi
                         	COUNTER=`expr $COUNTER + 1`
                         	sleep 1