diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c35890164b..55edf58fb5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/help/en/help_alert_macros.php,
+	  include/help/es/help_alert_macros.php: Added to repository. Alert
+	  macro help files.
+
+	* godmode/alerts/configure_alert_template.php: Show alert macro help.
+
 2009-09-01  Sancho Lerena <slerena@artica.es>
 
 	* pandoradb_data.sql: Updated version, added two new module groups and 
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index c656c0a9ef..bc10af9733 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -1,4 +1,4 @@
-<?php 
+1<?php 
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
@@ -364,13 +364,13 @@ if ($step == 2) {
 	$table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '',
 		5, 7, true);
 	
-	$table->data['field1'][0] = __('Field 1');
+	$table->data['field1'][0] = __('Field 1') . print_help_icon ('alert_macros', true);
 	$table->data['field1'][1] = print_input_text ('field1', $field1, '', 35, 255, true);
 	
-	$table->data['field2'][0] = __('Field 2');
+	$table->data['field2'][0] = __('Field 2') . print_help_icon ('alert_macros', true);
 	$table->data['field2'][1] = print_input_text ('field2', $field2, '', 35, 255, true);
 	
-	$table->data['field3'][0] = __('Field 3');
+	$table->data['field3'][0] = __('Field 3') . print_help_icon ('alert_macros', true);
 	$table->data['field3'][1] = print_textarea ('field3', 10, 30, $field3, '', true);
 	
 	$table->data[4][0] = __('Default action');
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
new file mode 100644
index 0000000000..124043932e
--- /dev/null
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>Alert macros</h1>
+
+<p>
+The following macros are available:
+<ul>
+<li>_field1_: User defined field 1.</li>
+<li>_field2_: User defined field 2.</li>
+<li>_field3_: User defined field 3.</li>
+<li>_agent_: Name of the agent that fired the alert.</li>
+<li>_address_: Address of the agent that fired the alert.</li>
+<li>_timestamp_: Time when the alert was fired.</li>
+<li>_data_: Module data that caused the alert to fire.</li>
+<li>_alert_description_: Alert description.</li>
+<li>_alert_threshold_: Alert threshold.</li>
+<li>_alert_times_fired_: Number of times the alert has been fired.</li>
+</ul>
+<p>
+</p>
+Example: Agent _agent_ error: _alert_description_.
+</p>
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
new file mode 100644
index 0000000000..a7d2b74dab
--- /dev/null
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>Macros de alertas</h1>
+
+<p>
+Las siguientes macros están disponibles:
+<ul>
+<li>_field1_: Campo 1 definido por el usuario.</li>
+<li>_field2_: Campo 2 definido por el usuario.</li>
+<li>_field3_: Campo 3 definido por el usuario.</li>
+<li>_agent_: Nombre del agente que disparó la alerta.</li>
+<li>_address_: Dirección del agente que disparó la alerta.</li>
+<li>_timestamp_: Hora y fecha en que se disparó la alerta.</li>
+<li>_data_: Dato que hizo que la alerta se disparase.</li>
+<li>_alert_description_: Descripción de la alerta.</li>
+<li>_alert_threshold_: Umbral de la alerta.</li>
+<li>_alert_times_fired_: Número de veces que se ha disparado la alerta.</li>
+</ul>
+<p>
+</p>
+Ejemplo: Error en el agente _agent_: _alert_description_.
+</p>