diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 531c8aeafc..04428748b8 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-04  Sancho Lerena <slerena@artica.es>
+
+	* conf/pandora_server.conf: Some "fixed" descriptions and sample
+	setup, I hope this help to clarify new users how to setup the MTA
+	(A LOTS of problems with this in forums), and some new inline 
+	documentation about some configuration tokens.
+
 2010-03-24  Sancho Lerena <slerena@artica.es>
 
     * util/pandora_manage.pl: New tool to do things in Pandora (system wide)
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 8b22417e9d..e0205048b6 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -30,6 +30,16 @@ snmp_logfile /var/log/pandora/pandora_snmptrap.log
 
 errorlog_file /var/log/pandora/pandora_server.error
 
+# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground 
+# this could be also configured on commandline with -D option
+
+# daemon 1
+
+# Database credentials. A VERY important configuration.
+# This must be the same credentials used by your Pandora FMS Console
+# but could be different if your console is not running in the same
+# host than the server. Check your console setup in /include/config.php
+
 # dbname: Database name (pandora by default
 
 dbname pandora
@@ -38,11 +48,6 @@ dbname pandora
 
 dbuser pandora
 
-# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground 
-# this could be setup on command line with -D option
-
-# daemon 1
-
 # dbpass: Database password
 
 dbpass pandora
@@ -52,7 +57,8 @@ dbpass pandora
 dbhost localhost
 
 # verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
-# -v in command line (verbose) or -d (debug)
+# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
+# set to 0 or 1 on production enviroments.
 
 verbosity 1
 
@@ -99,7 +105,7 @@ wmiserver 0
 
 # Network timeout (in seconds) for timeout in network connections for Network agents
 
-network_timeout 2
+network_timeout 5
 
 # Server keepalive (in seconds)
 
@@ -130,7 +136,7 @@ tcp_timeout 30
 # snmp_timeout: specific timeout for snmp request.
 
 snmp_checks 1
-snmp_timeout 3
+snmp_timeout 5
 
 # snmp_proc_deadresponse 1 (default): Return DOWN if cannot contact 
 # or receive NULL from a SNMP PROC module.
@@ -139,12 +145,12 @@ snmp_proc_deadresponse 1
 
 # plugin_threads: Specify number of plugin server threads for processing plugin calls
 
-plugin_threads 3
+plugin_threads 2
 
 # plugin_timeout: Specify number of seconds calling plugin exec waiting for response
 # after this time, call is aborted and result is "unknown".
 
-plugin_timeout 5
+plugin_timeout 15
 
 # wmi_timeout : specific timeout for wmi request.
 
@@ -163,18 +169,25 @@ recon_threads 2
 dataserver_threads 2
 
 # mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
-# mta_address 192.168.50.1
+#mta_address 192.168.50.1
 
 mta_address localhost
 
 # mta_port: MTA port (default 25)
-# mta_port 25
+#mta_port 25
 
-# mta_user: MTA User (if needed for auth)
-# mta_pass: MTA Pass (if needed for auth)
-# mta_auth: MTA Auth system (if needed, support: LOGIN PLAIN CRAM-MD5 DIGEST-MD)
-# mta_from: Email address that sends the mail, by default is pandora@localhost 
+# mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
+#mta_user myuser@mydomain.com
+
+# mta_pass MTA Pass (if needed for auth)
+#mta_pass mypassword
+
+# mta_auth MTA Auth system (if needed, support: LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+#mta_auth LOGIN
+
+# mta_from Email address that sends the mail, by default is pandora@localhost 
 #           probably you need to change it to avoid problems with your antispam
+#mta_from pandora@sampledomain.com
 
 # xprobe2: Optional package to detect OS types using advanced TCP/IP 
 # fingerprinting tecniques, much more accurates than stadard nmap.