diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 13b743fda6..7316e9ca1f 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent: Pass server_pwd and server_ssl configuration tokens
+	  to tentacle. Fixes bug #3080299.
+
 2010-10-07  Ramon Novoa  <rnovoa@artica.es>
 
 	* Linux/pandora_agent.conf: Added an example usage of the
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index a281d3b9ae..3ef43d6aa4 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -424,6 +424,12 @@ sub read_config (;$) {
 	# Set the maximun number of threads
 	$ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'}) if defined ($Sem);
 
+	# Set tentacle client options
+	if ($Conf{'transfer_mode'} eq 'tentacle') {
+		$Conf{'server_opts'} = '-x \'' . $Conf{'server_pwd'} . '\' ' . $Conf{'server_opts'} if ($Conf{'server_pwd'} ne '');
+		$Conf{'server_opts'} = '-c ' . $Conf{'server_opts'} if ($Conf{'server_ssl'} eq 'yes');
+	}
+
 	close (CONF_FILE);
 }