diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index e0d74bfad7..44089b43fe 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Ramon Novoa  <rnovoa@artica.es>
+
+	* util/pandora_xml_stress.pl: Remove new line and carriage return
+	  characters when parsing the configuration file.
+
 2014-06-24  Ramon Novoa  <rnovoa@artica.es>
 
 	* util/recon_scripts/snmp-recon.pl: Improved host connection.
diff --git a/pandora_server/util/pandora_xml_stress.pl b/pandora_server/util/pandora_xml_stress.pl
index 849b1c331b..262bf53650 100755
--- a/pandora_server/util/pandora_xml_stress.pl
+++ b/pandora_server/util/pandora_xml_stress.pl
@@ -47,7 +47,8 @@ sub load_config ($\%\@) {
 	open (FILE, "<", $conf_file) || die ("[error] Could not open configuration file '$conf_file': $!.\n\n");
 	
 	while (my $line = <FILE>) {
-		
+		$line =~ s/[\r\n]+//g;
+
 		# A module definition
 		if ($line =~ m/module_begin/) {
 			my %module;
@@ -56,6 +57,7 @@ sub load_config ($\%\@) {
 			next if ($line =~ m/^#/);
 			
 			while (my $line = <FILE>) {
+				$line =~ s/[\r\n]+//g;
 				
 				# A comment
 				next if ($line =~ m/^#/);