diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 92c81002eb..4283d504ec 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: Fixed a default module type.
+
+	MERGED FROM 4.0.2
+
 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* win32/bin/pandora_agent.conf: Improved windows configuration file.
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 5d7264413c..d210fadac2 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -240,13 +240,11 @@ module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df.vbs"
 # Example of a remote TCP check
 #module_begin
 #module_name Google Port 80
-#module_type generic_data
+#module_type generic_proc
 #module_tcpcheck http://www.google.com
 #module_port 80
 #module_timeout 5
 #module_description Check local port 80
-#module_min_critical 0
-#module_max_critical 1
 #module_end
 
 # Example of regexp matching