diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 59ca5cd834..a4578f8f43 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-08  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandoradb.sql, extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added an
+	  index on tagente_modulo.nombre to improve alert listings. Thanks to
+	  Manuel Arostegui. 
+
 2011-08-08 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* operation/agentes/sla_view.php: Fixed a bug related to a function
diff --git a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
index 29d608b0a4..18f00e87c7 100644
--- a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
+++ b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
@@ -177,7 +177,8 @@ CREATE TABLE IF NOT EXISTS `ttag_event` (
 ALTER TABLE `tagente_modulo` ADD COLUMN (`unit` text DEFAULT '');
 ALTER TABLE `tagente_modulo` ADD COLUMN (`str_warning` text DEFAULT '');
 ALTER TABLE `tagente_modulo` ADD COLUMN (`str_critical` text DEFAULT '');
-ALTER TABLE `tagente_modulo` ADD INDEX module(id_modulo);
+ALTER TABLE `tagente_modulo` ADD INDEX module (`id_modulo`);
+ALTER TABLE `tagente_modulo` ADD INDEX nombre (`nombre`);
 
 -- -----------------------------------------------------
 -- Table `tevento`
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 9c748ff281..c4a7612e55 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -191,7 +191,8 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
   KEY `tam_agente` (`id_agente`),
   KEY `id_tipo_modulo` (`id_tipo_modulo`),
   KEY `disabled` (`disabled`),
-  KEY `module` (`id_modulo`)
+  KEY `module` (`id_modulo`),
+  KEY `nombre` (`nombre`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 -- snmp_oid is also used for WMI query