diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 51a9b0a3c3..3374b194de 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-11  Ramon Novoa  <rnovoa@artica.es>
+
+	* godmode/setup/setup_netflow.php: Fixed a string.
+
+	* include/functions_config.php,
+	  operation/menu.php,
+	  godmode/menu.php: Added support for the log viewer.
+
 2013-01-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_component_groups.php
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 0eb29419b9..ba56d0a485 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -208,6 +208,9 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	$sub["godmode/setup/file_manager"]["text"] = __('File manager');
 	if ($config['activate_netflow'])
 		$sub["godmode/setup/setup_netflow"]["text"] = __('Netflow');
+	if ($config['log_collector'] == 1) {
+		enterprise_hook ('log_collector_submenu');
+	}
 	if ($config['activate_gis'])
 		$sub["godmode/setup/gis"]["text"] = __('Map conections GIS');
 	$sub["godmode/setup/links"]["text"] = __('Links');
diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php
index da63ddf52b..d6252b5372 100644
--- a/pandora_console/godmode/setup/setup_netflow.php
+++ b/pandora_console/godmode/setup/setup_netflow.php
@@ -25,7 +25,7 @@ check_login ();
 
 if (! check_acl ($config["id_user"], 0, "IR")) {
 	db_pandora_audit("ACL Violation",
-		"Trying to access event viewer");
+		"Trying to access netflow setup");
 	require ("general/noaccess.php");
 	return;
 }
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index be06afc624..6ff4e584e1 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -69,7 +69,7 @@ function config_update_value ($token, $value) {
  */
 function config_update_config () {
 	global $config;
-	
+
 	/* If user is not even log it, don't try this */
 	if (! isset ($config['id_user']))
 		return false;
@@ -135,7 +135,6 @@ function config_update_config () {
 			config_update_value ('replication_dbpass', (string)get_parameter('replication_dbpass'));
 			config_update_value ('replication_dbport', (string)get_parameter('replication_dbport'));
 			config_update_value ('replication_mode', (string)get_parameter('replication_mode'));
-			
 			config_update_value ('public_url', get_parameter('public_url'));
 			config_update_value ('referer_security', get_parameter('referer_security'));
 			
@@ -153,6 +152,8 @@ function config_update_config () {
 				config_update_value ('enable_pass_history', get_parameter('enable_pass_history'));
 				config_update_value ('compare_pass', get_parameter('compare_pass'));
 			}
+			
+			config_update_value ('log_collector', (bool)get_parameter('log_collector'));
 			/////////////
 			break;
 		case 'godmode/setup/setup_auth':
@@ -302,6 +303,9 @@ function config_update_config () {
 			config_update_value ('netflow_nfdump', get_parameter ('netflow_nfdump'));
 			config_update_value ('netflow_max_resolution', get_parameter ('netflow_max_resolution'));
 			break;
+		case 'enterprise/godmode/setup/setup_log_collector':
+			config_update_value ('log_dir', (string)get_parameter('log_dir'));
+			break;
 	}
 	
 	enterprise_include_once('include/functions_policies.php');
@@ -474,6 +478,14 @@ function config_process_config () {
 		config_update_value ('replication_mode', "only_validated");
 	}
 	
+	if (!isset ($config["log_collector"])) {
+		config_update_value ('log_collector', 0);
+	}
+
+	if (!isset ($config["log_dir"])) {
+		config_update_value ('log_dir', '/var/spool/pandora/data_in/log');
+	}
+
 	if (!isset ($config["font_size"])) {
 		config_update_value ('font_size', 6);
 	}
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index d23484da9f..9555ee2260 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -64,6 +64,9 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 	$sub["operation/servers/recon_view"]["text"] = __('Recon view');
 	$sub["operation/servers/recon_view"]["refr"] = 0;
 	
+	if ($config['log_collector'] == 1) {
+		enterprise_hook ('log_collector_menu');
+	}
 	
 	//SNMP Console
 	$sub["operation/snmpconsole/snmp_view"]["text"] = __('SNMP console');