diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 65f948dcb4..f278cc56fb 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-13  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent: Merged from 4.0 branch. Quote the XML data file name
+	  before trying to send it.
+
 2013-06-07  Ramon Novoa  <rnovoa@artica.es>
 
 	* DEBIAN/make_deb_package.sh: Merged from 4.0 branch. Create the agent's
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 2cb36523da..d7b8598d04 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -739,9 +739,9 @@ sub send_file {
 	my $output;
 
 	if ($Conf{'transfer_mode'} eq 'tentacle') {
- 		$output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} $file 2>&1 >$DevNull`;
+ 		$output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} "$file" 2>&1 >$DevNull`;
 	} elsif ($Conf{'transfer_mode'} eq 'ssh') {
- 		$output = `scp -P $Conf{'server_port'} $file pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`;
+ 		$output = `scp -P $Conf{'server_port'} "$file" pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`;
 	} elsif ($Conf{'transfer_mode'} eq 'ftp') {
 		my $base = basename ($file);
 		my $dir = dirname ($file);
@@ -755,7 +755,7 @@ sub send_file {
 		quit
 		FEOF1`
 	} elsif ($Conf{'transfer_mode'} eq 'local') {
-		$output = `cp $file $Conf{'server_path'}/ 2>&1 >$DevNull`;
+		$output = `cp "$file" "$Conf{'server_path'}/" 2>&1 >$DevNull`;
 	}
 
 	# Get the errorlevel