diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 8c420ad9dd..a6482aa0ae 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Config.pm: Disable enterprise ICMP and SNMP servers
+	  by default.
+
 2011-10-20  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/Tools.pm: Fixed mistake in the last commit
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 3ef959cf17..21380f637e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -236,9 +236,9 @@ sub pandora_load_config {
 	$pa_config->{'openstreetmaps_description'} = 0;
 	$pa_config->{"eventserver"} = 1; # 4.0
 	$pa_config->{"event_window"} = 3600; # 4.0
-	$pa_config->{"icmpserver"} = 1; # 4.0
+	$pa_config->{"icmpserver"} = 0; # 4.0
 	$pa_config->{"icmp_threads"} = 3; # 4.0
-	$pa_config->{"snmpserver"} = 1; # 4.0
+	$pa_config->{"snmpserver"} = 0; # 4.0
 	$pa_config->{"snmp_threads"} = 3; # 4.0
 	$pa_config->{"block_size"} = 15; # 4.0