diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 7012a2771c..b760d1d0df 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-25  Sergio Martin <sergio.martin@artica.es>
+
+	* win32/bin/pandora_agent.conf
+	unix/Linux/pandora_agent.conf: Restore files changed
+	by error in last commit
+
 2012-04-25  Sergio Martin <sergio.martin@artica.es>
 
 	* unix/plugins/inventory: Fixed init_services inventory modules
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index deb1a2a844..2dfa829dc3 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,4 +1,4 @@
-
+# Base config file for Pandora FMS agents
 # Version 3.0, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
@@ -31,7 +31,7 @@ udp_server_port 41122
 udp_server_auth_address 0.0.0.0
 
 # By default, agent takes machine name
-agent_name     huelga 
+#agent_name     adama
 
 #Parent agent_name
 #parent_agent_name caprica
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 0624876dec..d210fadac2 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -17,7 +17,7 @@
 
 # NOTE: The variables $*$ will be substituted in the installation wizard
 
-server_ip 172.18.183.4 
+server_ip $ServerIP$
 server_path /var/spool/pandora/data_in
 temporal "$AgentTemp$"