diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 9ca3d8efe8..191e68ddf5 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,9 +1,16 @@
+2006-11-23  Raul Mateos <raulofpandora@gmail.com>
+
+	* linux/pandora_agent.sh, linux/pandora_agent_daemon: Update license,
+	translated text from spanish to english, updated build.
+	
+	* linux/pandora_agent.conf: Solved small bug with vmstat.
+
 2006-09-20  Sancho Lerena  <slerena@artica.es>
 
 	* linux/pandora_agent.sh: Inserted code for detect Linux Distro,
 	and get versions (ported from babel agent code).
 
-2006-08-30 Sancho Lerena <slerena@gmail.com>
+2006-08-30 Sancho Lerena <slerena@artica.es>
 
 	* pandora_agent/ChangeLog: Created and added to repository
 
diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf
index d3dbbbf978..297be1ac05 100755
--- a/pandora_agents/linux/pandora_agent.conf
+++ b/pandora_agents/linux/pandora_agent.conf
@@ -1,7 +1,7 @@
-# Fichero de configuracion base de agentes de Pandora
-# Base config file for Pandora agents
-# Version 1.2 Beta 2
-# Licenced under GPL licence, 2003-2005 Sancho Lerena
+# Fichero de configuracion base de agentes de Pandora FMS
+# Base config file for Pandora FMS agents
+# Version 1.2
+# Licensed under GPL license, 2003-2006 Sancho Lerena
 
 # General Parameters
 # ==================
@@ -23,7 +23,7 @@ module_begin
 module_name cpu_user
 module_type generic_data
 module_interval 1
-module_exec vmstat 1 2 | tail -1 | awk '{ print $14 }'
+module_exec vmstat 1 2 | tail -1 | awk '{ print $13 }'
 module_max 100
 module_min 0
 module_descripcion User CPU Usage (%)
@@ -32,7 +32,7 @@ module_end
 module_begin 
 module_name cpu_sys
 module_type generic_data
-module_exec vmstat 1 2 | tail -1 | awk '{ print $15 }'
+module_exec vmstat 1 2 | tail -1 | awk '{ print $14 }'
 module_max 100
 module_min 0
 module_description System CPU Usage (%)
diff --git a/pandora_agents/linux/pandora_agent.sh b/pandora_agents/linux/pandora_agent.sh
index eed5ed2580..ec2efc5b30 100755
--- a/pandora_agents/linux/pandora_agent.sh
+++ b/pandora_agents/linux/pandora_agent.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 # **********************************************************************
-# Pandora Generic Host Agent
-# Linux version 
-# (c) Sancho Lerena 2003-2006, <slerena@gmail.com> 
-# with the help of many people. Please see http://pandora.sf.net
+# Pandora FMS Generic Host Agent
+# GNU/Linux version 
+# (c) Sancho Lerena 2003-2006, <slerena@artica.es> 
+# with the help of many people. Please see http://pandora.sourceforge.net
 # Este codigo esta licenciado bajo la licencia GPL 2.0.
-# This code is licenced under GPL 2.0 licence.
+# This code is licensed under GPL 2.0 license.
 # **********************************************************************
 AGENT_VERSION=1.2
-AGENT_BUILD=060920
+AGENT_BUILD=061123
 
 IFS=$'\n'
 # Begin cycle for adquire primary config tokens
@@ -124,11 +124,11 @@ fi
 while [ "1" == "1" ]
 do
 
- 	# Fecha y hora. Se genera un serial (numero de segundos desde 1970) para cada paquete generado.
+ 	# Date and time, SERIAL is number of seconds since 1/1/1970, for every packet.
  	TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
  	SERIAL=`date +"%s"`
  
- 	# Nombre de los archivos
+ 	# File names
  	DATA=$TEMP/$NOMBRE_HOST.$SERIAL.data
  	DATA2=$TEMP/$NOMBRE_HOST.$SERIAL.data_temp
  	CHECKSUM=$TEMP/$NOMBRE_HOST.$SERIAL.checksum
@@ -216,7 +216,7 @@ do
               		EXECUTE=`expr \( $CONTADOR + 1 \) % $MODULEINTERVAL`
   		fi
 
-		# If module end, and execute for this module is enabled
+		# If module ends, and execute for this module is enabled
 		# then write 
 
 		if [ $MODULE_END -eq 1 ]
diff --git a/pandora_agents/linux/pandora_agent_daemon b/pandora_agents/linux/pandora_agent_daemon
index 8c4cfa3008..68e0b06fb0 100755
--- a/pandora_agents/linux/pandora_agent_daemon
+++ b/pandora_agents/linux/pandora_agent_daemon
@@ -1,7 +1,9 @@
 #!/bin/bash
-# Script de arranque de Agente Pandora
-# Sancho Lerena, <slerena@gmail.com>
+# Init script for Pandora FMS agent
+# Script de arranque del agente Pandora FMS
+# Generic GNU/Linux version
 # Version para GNU/Linux (generico)
+# Sancho Lerena, <slerena@artica.es>
 # v1.2
 
 ### BEGIN INIT INFO
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 07761b6c73..16464a2d3f 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -16,8 +16,9 @@
 server_ip 127.0.0.1
 server_path /opt/pandora_server/data_in
 temporal "C:\temp"
-interval 1
+interval 10
 agent_name localhost
+pandora_debug 1
 
 # Module Definition
 # =================
@@ -56,6 +57,22 @@ module_proc lsass.exe
 module_description LSASS Process
 module_end
 
+# Is lsass.exe process alive ?
+module_begin
+module_name Proc_winlogon
+module_type generic_proc
+module_proc winlogon.exe
+module_description Winlogon
+module_end
+
+# Is lsass.exe process alive ?
+module_begin
+module_name Proc_cmd
+module_type generic_proc
+module_proc cmd.exe
+module_description cmd
+module_end
+
 # Received packets
 module_begin
 module_name ReceivedPackets