diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index b1be1c2a04..29f8282b8e 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06  Sergio Martin <sergio.martin@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Add macros substitution in all the
+	text fields of generate event command
+
 2013-03-06  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Change the update count of fired alerts 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index d269bb253f..710681d10e 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -852,8 +852,15 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 	
 	# Pandora FMS Event
 	} elsif ($clean_name eq "Pandora FMS Event") {
+		$field1 = subst_alert_macros ($field1, \%macros);
+		$field3 = subst_alert_macros ($field3, \%macros);
+		$field4 = subst_alert_macros ($field4, \%macros);
+		$field6 = subst_alert_macros ($field6, \%macros);
+		$field7 = subst_alert_macros ($field7, \%macros);
+		$field8 = subst_alert_macros ($field8, \%macros);
+		
 		# Field 1 (event text)
-		my $event_text = subst_alert_macros ($field1, \%macros);
+		my $event_text = $field1;
 		
 		# Field 2 (event type)
 		my $event_type = $field2;