diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index e33cbc63f6..ba32fe4a10 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* pandora_agent_installer: Added correct user to tentacle_client binary.
+
 2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* pandora_agent_installer: Modified agent isntaller to deal with 
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 2b20e8e327..6e11cd7b7b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -321,6 +321,13 @@ install () {
 	echo "Copying tentacle client to $PANDORA_BASE$TENTACLE"
 	cp tentacle_client $PANDORA_BASE$TENTACLE
 	chmod 755 $PANDORA_BASE$TENTACLE
+	if [ "$OS_NAME" = "FreeBSD" ]
+	then
+		chown $PANDORA_USER:wheel $PANDORA_BASE$TENTACLE	
+	else
+		chown $PANDORA_USER:root $PANDORA_BASE$TENTACLE
+	fi	
+	
 
 	echo "Installing the Pandora Agent and Tentacle Client manuals"
 	cp man/man1/tentacle_client.1.gz $PANDORA_BASE/$PANDORA_MAN/man1