diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index c402d679d1..b9271d35fc 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-17  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Config.pm,
+	  lib/PandoraFMS/DataServer.pm: Added support for log modules.
+
 2013-01-16  Sergio Martin <sergio.martin@artica.es>
 
 	* util/pandora_db.pl: Added the history events to the 
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index aaa984c3e2..9994c4828f 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -148,6 +148,10 @@ sub pandora_get_sharedconfig ($$) {
 	$pa_config->{"netflow_path"} = pandora_get_tconfig_token ($dbh, 'netflow_path', '/var/spool/pandora/data_in/netflow');
 	$pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 300);
 	$pa_config->{"netflow_daemon"} = pandora_get_tconfig_token ($dbh, 'netflow_daemon', '/usr/bin/nfcapd');
+
+	# Log module configuration
+	$pa_config->{"log_dir"} = pandora_get_tconfig_token ($dbh, 'log_dir', '/var/spool/pandora/data_in/log');
+	$pa_config->{"log_interval"} = pandora_get_tconfig_token ($dbh, 'log_interval', 3600);
 }
 
 ##########################################################################
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index b03512983b..9fe39e6602 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -503,6 +503,10 @@ sub process_xml_data ($$$$$) {
 	# Process inventory modules
 	enterprise_hook('process_inventory_data', [$pa_config, $data, $server_id, $agent_name,
 							 $interval, $timestamp, $dbh]);
+
+	# Process log modules
+	enterprise_hook('process_log_data', [$pa_config, $data, $server_id, $agent_name,
+							 $interval, $timestamp, $dbh]);
 }
 
 ##########################################################################