diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index cb99fce15a..bacb88dd06 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-17  Dario Rodriguez  <dario.rodriguez@artica.es>
+
+	* unix/pandora_agent: Fixed a typo with logfile parameter. Also fixed
+	the gathering of secondary_server_opts parameters when transfer mode is 
+	Tentacle. Thanks to KIKUCHI Koichiro for the report.
+
 2011-03-02  Ramon Novoa  <rnovoa@artica.es>
 
 	* win32/modules/pandora_module_factory.cc, unix/pandora_agent: Changed
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index b2b7ede2b1..6d14f58896 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -117,8 +117,8 @@ my $ConfFile = 'pandora_agent.conf';
 my %Conf = (
 	'server_ip' => 'localhost',
 	'server_path' => '/var/spool/pandora/data_in',
+	'logfile' =>'/var/log/pandora/pandora_agent.log',
 	'temporal' => '/var/spool/pandora',
-	'log_file' => '/var/log/pandora/pandora_agent.log',
 	'interval' => 300,
 	'debug' => 0,		
 	'agent_name' => hostname (),
@@ -438,6 +438,12 @@ sub read_config (;$) {
 		$Conf{'server_opts'} = '-c ' . $Conf{'server_opts'} if ($Conf{'server_ssl'} eq 'yes');
 	}
 
+	# Set tentacle client options for secondary server	
+	if ($Conf{'secondary_transfer_mode'} eq 'tentacle') {
+		$Conf{'secondary_server_opts'} = '-x \'' . $Conf{'secondary_server_pwd'} . '\' ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_pwd'} ne '');
+		$Conf{'secondary_server_opts'} = '-c ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_ssl'} eq 'yes');		
+	}
+
 	close (CONF_FILE);
 }