diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 766b50844e..66108939ef 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-28  Sancho Lerena <slerena@artica.es>
+
+	* pandora_server.spec: Start tentacle after install breaks the
+	Upgrade process on RPM (error if already running).
+
+	* util/pandora_server: Added mysql as "should-start" in LSB tags
+
 2009-12-23  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/Core.pm,
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f0c9419b0a..1743a08b32 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version	    3.0.0
-%define release     4
+%define release     5
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -101,7 +101,8 @@ if [ ! -e /etc/pandora/pandora_server.conf ] ; then
    echo " "
 fi
 
-/etc/init.d/tentacle_serverd start
+echo "Don't forget to start Tentacle Server daemon if you want to receive"
+echo "data using tentacle"
 
 %preun
 /etc/init.d/pandora_server stop &>/dev/null
diff --git a/pandora_server/util/pandora_server b/pandora_server/util/pandora_server
index 296f6461f9..357b089b44 100755
--- a/pandora_server/util/pandora_server
+++ b/pandora_server/util/pandora_server
@@ -10,7 +10,7 @@
 ### BEGIN INIT INFO
 # Provides:       pandora_server
 # Required-Start: $syslog cron
-# Should-Start:   $network cron
+# Should-Start:   $network cron mysql
 # Required-Stop:  $syslog 
 # Should-Stop:    $network 
 # Default-Start:  2 3 5