diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index d06764632f..158fae4025 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-29  Sancho Lerena <slerena@artica.es>
+
+	* pandora_server/lib/PandoraFMS/SNMPServer.pm
+	pandora_server/lib/PandoraFMS/Core.pm: SNMP Alerts now receibe trap type on
+	the _data_ macro.
+
 2011-09-28 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* util/recon_scripts/snmpdevices.pl: Fixed a bug which creates duplicated
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index ab24224286..3b37da84b3 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1588,8 +1588,8 @@ Execute alerts that apply to the given SNMP trap.
 
 =cut
 ##########################################################################
-sub pandora_evaluate_snmp_alerts ($$$$$$$$) {
-	my ($pa_config, $trap_id, $trap_agent, $trap_oid,
+sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
+	my ($pa_config, $trap_id, $trap_agent, $trap_oid, $trap_type,
 		$trap_oid_text, $trap_value, $trap_custom_oid, $dbh) = @_;
 
 
@@ -1724,7 +1724,7 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$) {
 							WHERE talert_actions.id_alert_command = talert_commands.id
 							AND talert_actions.id = ?', $alert->{'id_alert'});
 
-			my $trap_rcv_full = $trap_oid . " " . $trap_value. " ". $trap_custom_oid;
+			my $trap_rcv_full = $trap_oid . " " . $trap_value. " ". $trap_type. " " . $trap_custom_oid;
 
 			pandora_execute_action ($pa_config, $trap_rcv_full, \%agent, \%alert, 1, $action, undef, $dbh, $timestamp) if (defined ($action));
 
diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm
index a11c4d463e..a56df42de3 100644
--- a/pandora_server/lib/PandoraFMS/SNMPServer.pm
+++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm
@@ -166,7 +166,7 @@ sub pandora_snmptrapd {
 					logger ($pa_config, "Received SNMP Trap from $source", 4);
 
 					# Evaluate alerts for this trap
-					pandora_evaluate_snmp_alerts ($pa_config, $trap_id, $source, $oid, $oid, $value, $custom_oid, $dbh);
+					pandora_evaluate_snmp_alerts ($pa_config, $trap_id, $source, $oid, $type, $oid, $value, $custom_oid, $dbh);
 				}
 			}