diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index cd08e5d8d7..22a64adad9 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-13  Manuel Arostegui <marostegui@artica.es>
+
+	* linux/pandora_agent.conf: Commented SNMPGET example module
+	it is not useful in a default installation since it will always
+	fail.
+
+	* win32/bin/pandora_agent.conf: Added example for the new features
+	such as watchdog and asynchronous mode.
+
 2009-02-24  Ramon Novoa  <rnovoa@artica.es>
 
 	* win32/modules/pandora_module_proc.cc,
diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf
index 6a67489952..34b8c3764d 100755
--- a/pandora_agents/linux/pandora_agent.conf
+++ b/pandora_agents/linux/pandora_agent.conf
@@ -90,12 +90,6 @@ module_min 0
 module_description User CPU Usage (%)
 module_end
 
-module_begin
-module_name Remote_Cisco_Port14_status
-module_type generic_proc
-module_exec snmpget -v 1 -c artica06 192.168.50.250 IF-MIB::ifOperStatus.13
-module_end
-
 module_begin 
 module_name cpu_sys
 module_type generic_data
@@ -158,6 +152,13 @@ module_type async_string
 module_exec last | head -1
 module_end
 
+#SNMPget module example
+##module_begin
+##module_name Remote_Cisco_Port14_status
+##module_type generic_proc
+##module_exec snmpget -v 1 -c artica06 192.168.50.250 IF-MIB::ifOperStatus.13
+##module_end
+
 # Plugin example
 
 # This parses /var/log/syslog file, under the module name "syslog"
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 009b8f7385..8fec19cc03 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -221,4 +221,42 @@ module_end
 #module_description Server errors
 #module_end
 
+# Example of asynchronous process checking
+#module_begin
+#module_name Notepad
+#module_type generic_data
+#module_proc notepad.exe
+#module_description Notepad
+#module_async yes
+#module_end
+
+# Example of watchdog process opening it if it gets closed.
+#module_begin
+#module_name Notepad
+#module_type generic_data
+#module_proc notepad.exe
+#module_description Notepad
+#module_async yes
+#module_watchdog yes
+#module_start_command c:\windows\notepad.exe
+#module_end
+
+# Example of asynchronous service checking
+# module_begin
+# module_name ServiceSched
+# module_type generic_proc
+# module_service Schedule
+# module_description Service Task scheduler
+# module_async yes
+# module_end
+
+# Example of watchdog service opening it if it gets closed.
+# module_begin
+# module_name ServiceSched
+# module_type generic_proc
+# module_service Schedule
+# module_description Service Task scheduler
+# module_async yes
+# module_watchdog yes
+# module_end