diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index cdc9e46a3e..92c81002eb 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* win32/bin/pandora_agent.conf: Improved windows configuration file.
+
+	MERGED FROM 4.0.2
+
 2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* win32/bin/pandora_agent.conf,
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 29f549ac10..5d7264413c 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -119,52 +119,16 @@ module_min_critical 91
 module_max_critical 100
 module_end
 
-# Free space on disk C: (%)
-module_begin
-module_name FreeDiskC
-module_type generic_data
-module_freepercentdisk C:
-module_description Free space on drive C: (%)
-module_min_warning 70
-module_max_warning 90
-module_min_critical 91
-module_max_critical 100
-module_end
-
 # Number processes
 module_begin
 module_name Number processes
 module_type generic_data
 module_exec tasklist | gawk "NR > 3 {print$0}" | wc -l
 module_description Number of processes running
-module_min_warning 600
-module_max_warning 799
-module_min_critical 800
-module_max_critical 1000
-module_end
-
-# Free space on disk C: (Total)
-module_begin
-module_name FreeDiskCTotal
-module_type generic_data
-module_freedisk C:
-module_description Free space on drive C: (Total)
-module_min_warning 501
-module_max_warning 700
-module_min_critical 300
-module_max_critical 500
-module_end
-
-# CPU usage percentage
-module_begin
-module_name CPUUse
-module_type generic_data
-module_cpuusage all
-module_description CPU# usage
-module_min_warning 70
-module_max_warning 90
-module_min_critical 91
-module_max_critical 100
+module_min_warning 175
+module_max_warning 249
+module_min_critical 250
+module_max_critical 300
 module_end
 
 # Free Memory
@@ -173,8 +137,8 @@ module_name FreeMemory
 module_type generic_data
 module_freepercentmemory
 module_description Free memory (%).
-module_min_warning 30
-module_max_warning 21
+module_min_warning 21
+module_max_warning 30
 module_min_critical 0
 module_max_critical 20
 module_end
@@ -204,13 +168,46 @@ module_name DHCP Enabled
 module_type generic_proc
 module_service Dhcp
 module_description Check DCHP service enabled
-module_min_critical 0
-module_max_critical 1
+module_end
+
+#Antivirus monitoring
+#This modules checks the antivirus is running on your system, if there is and antivirus
+#This module gets the last date the signature file was updated and send this date to pandora.
+module_begin
+module_name Antivirus Last Update
+module_type async_string
+module_precondition =~ avguard.exe cmd.exe /c tasklist | grep avguard.exe | gawk "{print $1}"
+module_exec dir "%ProgramFiles%\Avira\AntiVir Desktop\aevdf.dat" | grep aevdf.dat | gawk "{print $1\" \"$2}"
+module_description Last update for Antivirus Signature file
 module_end
 
 # Example plugin to retrieve drive usage
 module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df.vbs"
 
+# Free space on disk C: (%)
+#module_begin
+#module_name FreeDiskC
+#module_type generic_data
+#module_freepercentdisk C:
+#module_description Free space on drive C: (%)
+#module_min_warning 31
+#module_max_warning 40
+#module_min_critical 0
+#module_max_critical 30
+#module_end
+
+# CPU usage percentage
+#module_begin
+#module_name CPUUse
+#module_type generic_data
+#module_cpuusage all
+#module_description CPU# usage
+#module_min_warning 70
+#module_max_warning 90
+#module_min_critical 91
+#module_max_critical 100
+#module_end
+
 # Free space on disk D: (%)
 # module_begin
 # module_name FreeDiskD
@@ -242,9 +239,9 @@ module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df.vbs"
 
 # Example of a remote TCP check
 #module_begin
-#module_name Local TCP Port 80
+#module_name Google Port 80
 #module_type generic_data
-#module_tcpcheck 127.0.0.1
+#module_tcpcheck http://www.google.com
 #module_port 80
 #module_timeout 5
 #module_description Check local port 80