diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index fc6d5a2f96..b3cd330047 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-19 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* win32/bin/pandora_agent.conf: Added sencodary server parameters example
+	in agent configuration.
+	
+	MERGED FROM 4.0.2
+
 2012-04-18 Dario Rodriguez <dario.rodriguez@artica.es>
 	
 	* unix/pandora_agent: Fixed a problem detecting agent user to launch
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 9397cfbda9..d8f2c64b73 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -84,6 +84,21 @@ server_port 41121
 # Enable or disable XML buffer.
 xml_buffer 0
 
+# Secondary server configuration
+# ==============================
+
+# If secondary_mode is set to on_error, data files are copied to the secondary
+# server only if the primary server fails. If set to always, data files are
+# always copied to the secondary server.
+#secondary_mode on_error
+#secondary_server_ip localhost
+#secondary_server_path /var/spool/pandora/data_in
+#secondary_server_port 41121
+#secondary_transfer_mode tentacle
+#secondary_server_pwd mypassword
+#secondary_server_ssl no
+#secondary_server_opts
+
 # Module Definition
 # Check online documentation and module library at http://pandorafms.org
 # =================