diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 43607e3aa6..d1d0f07f12 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-08  Ramon Novoa  <rnovoa@artica.es>
+
+	* util/pandora_db.pl: Delete unknown modules after a defined number
+	  of days.
+
 2011-07-08  Koichiro Kikuchi  <koichiro@rworks.jp>
 
 	* lib/PandoraFMS/Core.pm: Fixed alert macro substitution. Now
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 355601a230..48fc5b3934 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -401,6 +401,7 @@ sub pandora_load_config ($) {
 	$conf->{'_history_db_days'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'history_db_days'");
 	$conf->{'_history_db_step'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'history_db_step'");
 	$conf->{'_history_db_delay'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'history_db_delay'");
+	$conf->{'_days_delete_unknown'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'days_delete_unknown'");
 	db_disconnect ($dbh);
 
 	printf "Pandora DB now initialized and running (PURGE=" . $conf->{'_days_purge'} . " days, COMPACT=$conf->{'_days_compact'} days, STEP=" . $conf->{'_step_compact'} . ") ... \n\n";
@@ -470,6 +471,22 @@ sub pandora_checkdb_consistency {
 		db_do ($dbh, 'DELETE FROM talert_template_modules WHERE id_agent_module = ?', $id_agente_modulo);
 	}
 
+	print "[CHECKDB] Deleting unknown data (More than " . $conf{'_days_delete_unknown'} . " days)... \n";
+	if ($conf{'_days_delete_unknown'} > 0) {
+		my @modules = get_db_rows ($dbh, 'SELECT id_agente_modulo FROM tagente_estado WHERE estado = 3 AND utimestamp < UNIX_TIMESTAMP() - ?', 86400 * $conf{'_days_delete_unknown'});
+		foreach my $module (@modules) {
+			my $id_agente_modulo = $module->{'id_agente_modulo'};
+	
+			# Skip policy modules
+			next if (is_policy_module ($dbh, $id_agente_modulo));
+	
+			# Delete the module
+			db_do ($dbh, 'DELETE FROM tagente_modulo WHERE disabled = 0 AND id_agente_modulo = ?', $id_agente_modulo);;
+	
+			# Delete any alerts associated to the module
+			db_do ($dbh, 'DELETE FROM talert_template_modules WHERE id_agent_module = ?', $id_agente_modulo);
+		}
+	}
 	print "[CHECKDB] Checking database consistency (Missing status)... \n";
 
 	@modules = get_db_rows ($dbh, 'SELECT * FROM tagente_modulo');