diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 353d4fe418..6f412bd44a 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-09  Raul Mateos  <raulofpandora@gmail.com>
+
+	* linux/pandora_agent.conf: Added comments to all modules. This will
+	help in reporting (reporting get the module's descriptions) and it's
+	a good habit.
+
 2009-12-07  Raul Mateos  <raulofpandora@gmail.com>
 
 	* linux/pandora_agent_installer: Use tabs instead spaces. Small text
diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf
index a64eedb1ff..78b76d6d3b 100755
--- a/pandora_agents/linux/pandora_agent.conf
+++ b/pandora_agents/linux/pandora_agent.conf
@@ -121,6 +121,7 @@ module_begin
 module_name memfree
 module_type generic_data
 module_exec cat /proc/meminfo  | grep MemFree | awk '{ print $2 }'
+module_description Free Memory
 module_end
 
 # This module uses postprocess feature to pass postprocess value to module
@@ -129,12 +130,14 @@ module_name memused
 module_type generic_data
 module_exec cat /proc/meminfo | grep "Active"  | awk '{ print $2 }'
 module_postprocess 0,976
+module_description Meminfo postprocess
 module_end
 
 module_begin
 module_name proctotal
 module_type generic_data
 module_exec ps -A | wc -l
+module_description Total processes
 module_end
 
 # Process information
@@ -143,6 +146,7 @@ module_begin
 module_name sshDaemon
 module_type generic_proc
 module_exec ps -Af | grep sshd | grep -v "grep" | wc -l
+module_description Monitor SSH Daemon
 module_end
 
 # Async data example
@@ -151,6 +155,7 @@ module_begin
 module_name LastLogin
 module_type async_string
 module_exec last | head -1
+module_description Last Login
 module_end
 
 # Plugin example