diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index f278cc56fb..0890cb4c2d 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Sancho Lerena <slerena@artica.es>
+
+	* Linux/pandora_agent.conf: new defaul values (inventory enabled,
+	remote config enabled).
+
 2013-06-13  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Merged from 4.0 branch. Quote the XML data file name
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 426732bdac..a8c5ec075b 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -44,7 +44,7 @@ udp_server_auth_address 0.0.0.0
 
 # address: Enforce to server a ip address to this agent 
 # You can also try to detect the first IP using "auto", for example
-#address auto
+address auto
 # or setting a fixed IP address, like for example:
 #address 192.168.36.73
 
@@ -110,7 +110,7 @@ transfer_mode tentacle
 #cron_mode 
 
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
-#remote_config 1
+remote_config 1
 
 # If set to 1 start Drone Agent's Proxy Mode 
 # proxy_mode 1