diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 2c6db5740a..ef4c50622c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_server_installer: Change tentacle_server permissions.
+
 2011-02-22  Sancho Lerena <slerena@artica.es>
 
 	* Core.pm: Fixed bug #3175575
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 818e26341e..0d871c6596 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -307,6 +307,7 @@ perl-TimeDate perl-XML-Simple perl-libwww-perl mysql-client"
 					# Tentacle server install (Ubuntu)
 					echo "Installing tentacle server"
 					cp bin/tentacle_server /usr/bin
+					chown pandora /usr/bin/tentacle_server
 					cp util/tentacle_serverd $TENTACLE_SERVER
    					update-rc.d tentacle_serverd defaults
 				else
@@ -314,12 +315,14 @@ perl-TimeDate perl-XML-Simple perl-libwww-perl mysql-client"
 					then
 						echo "Creating Tentacle startup daemon"
 						cp bin/tentacle_server /usr/bin
+						chown pandora /usr/bin/tentacle_server
 						cp util/tentacle_serverd /etc/init.d/tentacle_serverd
 						insserv tentacle_serverd
 					else
 						# Tentacle server install (Other Distros)
 						echo "Installing tentacle server in /etc/rc.d/rc$INITLV.d/S80tentacle_serverd"
 						cp bin/tentacle_server /usr/bin
+						chown pandora /usr/bin/tentacle_server
 						cp util/tentacle_serverd /etc/init.d/tentacle_serverd
 						ln -s $TENTACLE_SERVER /etc/rc.d/rc$INITLV.d/S80tentacle_serverd
 					fi
@@ -335,6 +338,7 @@ perl-TimeDate perl-XML-Simple perl-libwww-perl mysql-client"
 				then
 					echo "Installing tentacle server"
 					cp bin/tentacle_server /usr/local/bin
+					chown pandora /usr/local/bin/tentacle_server
 					cp FreeBSD/tentacle_server $TENTACLE_SERVER
 					chmod 555 $TENTACLE_SERVER
 					echo "Installing Tentacle Server manual"