diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index c99dd19366..35f1693ce9 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-05  Sergio Martin <sergio.martin@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Add the new fields on snmp alerts
+	(now there are 10 fields). Bug 3605775
+
 2013-03-05  Sergio Martin <sergio.martin@artica.es>
 
 	* util/pandora_manage.pl: Add update counts when validate 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index e56c10d463..97a09e0cd4 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2762,6 +2762,13 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
 		$alert->{'al_field1'} = subst_alert_macros ($alert->{'al_field1'}, \%macros);
 		$alert->{'al_field2'} = subst_alert_macros ($alert->{'al_field2'}, \%macros);
 		$alert->{'al_field3'} = subst_alert_macros ($alert->{'al_field3'}, \%macros);
+		$alert->{'al_field4'} = subst_alert_macros ($alert->{'al_field4'}, \%macros);
+		$alert->{'al_field5'} = subst_alert_macros ($alert->{'al_field5'}, \%macros);
+		$alert->{'al_field6'} = subst_alert_macros ($alert->{'al_field6'}, \%macros);
+		$alert->{'al_field7'} = subst_alert_macros ($alert->{'al_field7'}, \%macros);
+		$alert->{'al_field8'} = subst_alert_macros ($alert->{'al_field8'}, \%macros);
+		$alert->{'al_field9'} = subst_alert_macros ($alert->{'al_field9'}, \%macros);
+		$alert->{'al_field10'} = subst_alert_macros ($alert->{'al_field10'}, \%macros);
 
 		# Check time threshold
 		$alert->{'last_fired'} = '1970-01-01 00:00:00' unless defined ($alert->{'last_fired'});
@@ -2789,6 +2796,13 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
 				'field1' => $alert->{'al_field1'},
 				'field2' => $alert->{'al_field2'},
 				'field3' => $alert->{'al_field3'},
+				'field4' => $alert->{'al_field4'},
+				'field5' => $alert->{'al_field5'},
+				'field6' => $alert->{'al_field6'},
+				'field7' => $alert->{'al_field7'},
+				'field8' => $alert->{'al_field8'},
+				'field9' => $alert->{'al_field9'},
+				'field10' => $alert->{'al_field10'},
 				'description' => $alert->{'description'},
 				'times_fired' => $times_fired,
 				'time_threshold' => 0,