diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 16edbad877..ac2a816717 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-29  Raul Mateos  <raulofpandora@gmail.com>
+
+	* win32/bin/pandora_agent.conf: Added comments about usage and samples.
+
 2007-08-27  Raul Mateos  <raulofpandora@gmail.com>
 
 	* win32/installer/How_to_create_installer.txt: Changed mpi name.
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 04d34ae715..1caeca6658 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,7 +1,7 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora FMS Windows Agent
 # Version 1.3.0
-# (c) 2006-207 Esteban Sanchez
+# (c) 2006-2007 Esteban Sanchez
 # (c) 2006-2007 Artica Soluciones Tecnologicas
 # This program is Free Software, you can redistribute it and/or modify it 
 # under the terms of the GNU General Public Licence as published by the Free Software
@@ -10,6 +10,8 @@
 # WITHOUT ANY WARRANTY, without ever the implied warranty of MERCHANTABILITY or FITNESS 
 # FOR A PARTICULAR PURPOSE.
 
+# Edit this file to change your parameters or/and add your own modules
+
 # General Parameters
 # ==================
 
@@ -18,9 +20,10 @@ server_path /var/spool/pandora/data_in
 temporal "C:\windows\temp"
 interval 300
 agent_name caprica
+# By default FTP is configured. To use SSH, just comment next two lines
 transfer_mode ftp
 ftp_password pandora123
-debug 1
+# debug 1
 
 # Module Definition
 # =================
@@ -51,22 +54,6 @@ module_service Eventlog
 module_description Eventlog Service
 module_end
 
-# Is SecureClient Service alive ?
-module_begin
-module_name Checkpoint_SecureClient
-module_type generic_proc
-module_proc SR_Service.exe
-module_description Checkpoint Secure Client VPN client
-module_end
-
-# Is description Network Connect Service VPN Client from Juniper alive ?
-module_begin
-module_name Juniper_VPN
-module_type generic_proc
-module_proc dsNcService.exe
-module_description Network Connect Service VPN Client from Juniper
-module_end
-
 # Is Microsoft Messenger running ?
 module_begin
 module_name MSN_Messenger
@@ -90,15 +77,7 @@ module_type generic_data
 module_freedisk C:
 module_description Free space on drive C:
 module_end
-
-# Free space on disk D:
-module_begin
-module_name FreeDiskD
-module_type generic_data
-module_freedisk D:
-module_description Free space on drive D:
-module_end
-
+
 # CPU usage percentage
 module_begin
 module_name CPUUse0
@@ -107,9 +86,45 @@ module_cpuusage 0
 module_description CPU#0 usage
 module_end
 
+# Free Memory
 module_begin
 module_name FreeMemory
 module_type generic_data
 module_freememory
 module_description Amount of free memory.
 module_end
+
+# Examples #
+# =========
+
+# Free space on disk D:
+# module_begin
+# module_name FreeDiskD
+# module_type generic_data
+# module_freedisk D:
+# module_description Free space on drive D:
+# module_end
+
+# CPU usage percentage
+# module_begin
+# module_name CPUUse1
+# module_type generic_data
+# module_cpuusage 1
+# module_description CPU#1 usage
+# module_end
+
+# Is SecureClient Service alive ?
+# module_begin
+# module_name Checkpoint_SecureClient
+# module_type generic_proc
+# module_proc SR_Service.exe
+# module_description Checkpoint Secure Client VPN client
+# module_end
+
+# Is description Network Connect Service VPN Client from Juniper alive ?
+# module_begin
+# module_name Juniper_VPN
+# module_type generic_proc
+# module_proc dsNcService.exe
+# module_description Network Connect Service VPN Client from Juniper
+# module_end
\ No newline at end of file