diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index b47a076a80..13b743fda6 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-07  Ramon Novoa  <rnovoa@artica.es>
+
+	* Linux/pandora_agent.conf: Added an example usage of the
+	  agent_threads configuration token.
+
 2010-10-06  Junichi Satoh  <junichi@rworks.jp>
 
 	* pandora_agent: Added FreeBSD specific commands.
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index ff9c0c660a..a4327fcdcb 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -88,6 +88,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 # remote_config 1
 
+# Number of threads to execute modules in parallel
+#agent_threads 1
+
 # Secondary server configuration
 # ==============================