diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 845f4b3329..b20e51e62f 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-05  Ramon Novoa  <rnovoa@artica.es>
+
+	* conf/pandora_server.conf: Disable ICMP and SNMP enterprise servers
+	  by default.
+
 2011-09-04  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/DB.pm, lib/PandoraFMS/Core.pm: Fixed policy queue (was
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index c2a4693a5b..e4704e70d8 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -322,13 +322,13 @@ eventserver 1
 event_window 3600
 
 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
-icmpserver 1
+icmpserver 0
 
 # Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
 icmp_threads 2
 
 # Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
-snmpserver 1
+snmpserver 0
 
 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
 snmp_threads 2