diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index c106251a1c..261c7c56c7 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12  Ramon Novoa  <rnovoa@artica.es>
+
+	* conf/pandora_server.conf: Fixed a couple of typos.
+
 2011-08-12  Sergio Martin <sergio.martin@artica.es>
 
 	* bin/pandora_server: Fixed policy queue when the server is launched
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index a702f4e876..c4241f9e76 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -211,7 +211,7 @@ nmap /usr/bin/nmap
 
 snmpget /usr/bin/snmpget
 
-# Location of the braa binary needed by the Enterprise ICMP Server (/usr/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
+# Location of the braa binary needed by the Enterprise SNMP Server (/usr/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
 braa /usr/bin/braa
 
 # Default group id for new agents created with Pandora FMS Data Server
@@ -330,6 +330,6 @@ snmpserver 1
 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
 snmp_threads 2
 
-# Block size for block producer/consumer servers, that is, number of modules per
-# block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
+# Block size for block producer/consumer servers, that is, the number of modules
+# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
 block_size 15