diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index ad457e9c6e..8685d9584f 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-16  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Decode HTML entities in macros.
+
 2010-11-11  Junichi Satoh  <junichi@rworks.jp>
 
 	* FreeBSD/tentacle_server: Fixed variable name of PID.
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index fb8dbf4bbf..6abb16d3f4 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1403,7 +1403,9 @@ sub subst_alert_macros ($$) {
 	my ($string, $macros) = @_;
 
 	while ((my $macro, my $value) = each (%{$macros})) {
-		$string =~ s/($macro)/$value/ig;
+		# Macro data may contain HTML entities
+		my $decoded_value = decode_entities ($value);
+		$string =~ s/($macro)/$decoded_value/ig;
 	}
 
 	return $string;