diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index e18f4454f1..d94b9049aa 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-22  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Fixed a couple of missing macros in 
+	  SNMP alerts.
+
 2010-09-22  Sergio Martin <sergio.martin@artica.es>
 
 	* util/pandora_manage.pl: Added the parameter with
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 626cdac6e5..f97fa5a8e6 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1312,13 +1312,14 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
 				'description' => $alert->{'description'},
 				'times_fired' => $times_fired,
 				'time_threshold' => 0,
-				'id_alert_action' => $alert->{'id_alert'},
+				'id' => $alert->{'id_alert'},
 				'priority' => $alert->{'priority'},
 			);
 
 			my %agent = (
 				'nombre' => $trap_agent,
 				'direccion' => $trap_agent,
+				'comentarios' => '',
 			);
 
 			# Execute alert