diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 728a9bb6d6..3bc568fa53 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Raúl Mateos  <raulofpandora@gmail.com>
+
+	* bin/pandora_server, lib/PandoraFMS/Config.pm, conf/pandora_server.conf,
+	pandora_server_upgrade: Updated year. Clean code.
+
 2010-05-13  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Fixed some monitor
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 19adf5aed3..fc79be261b 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -3,7 +3,7 @@
 # Pandora FMS Server
 # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org
 ##########################################################################
-# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L
+# Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ my @Servers;
 my $DBH;
 
 ########################################################################################
-# Server shutdown.  Handler to do a controlled shutdown.
+# Server shutdown. Handler to do a controlled shutdown.
 ########################################################################################
 sub pandora_shutdown () {
 	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' Shutdown by signal ', 1);
@@ -66,7 +66,7 @@ sub pandora_startup () {
 
 	# Connect to the DB
 	$DBH = db_connect ('mysql', $Config{'dbname'}, $Config{'dbhost'}, 3306,
-					   $Config{'dbuser'}, $Config{'dbpass'});
+					$Config{'dbuser'}, $Config{'dbpass'});
 
 	# Grab config tokens shared with the console and not in the .conf
 
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index e0205048b6..e6ca5eca4b 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -1,6 +1,9 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
+# Version 3.1
+# Licensed under GPL license v2,
+# (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
 # Please change it for your setup needs
 #############################################################################
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 21d0049c8f..c7fe2076a5 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -38,7 +38,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "3.1-dev";
-my $pandora_build = "100224";
+my $pandora_build = "100516";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -47,11 +47,11 @@ my %pa_config;
 # Public functions
 ##########################################################################
 # SUB pandora_help_screen()
-#  Show a help screen an exits
+# Shows a help screen and exits
 ##########################################################################
 
 sub help_screen {
-	print "\nSyntax: \n\n  pandora_server [ options ] < fullpathname to configuration file (pandora_server.conf) > \n\n";
+	print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file (pandora_server.conf) > \n\n";
 	print "Following options are optional : \n";
 	print "	-v        :  Verbose mode activated. Writes more information in the logfile \n";
 	print "	-d        :  Debug mode activated. Writes extensive information in the logfile \n";
@@ -71,7 +71,7 @@ sub help_screen {
 sub pandora_init {
 	my $pa_config = $_[0];
 	my $init_string = $_[1];
-	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2009 ArticaST\n";
+	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2010 ArticaST\n";
 	print "This program is OpenSource, licensed under the terms of GPL License version 2.\n";
 	print "You can download latest versions and documentation at http://www.pandorafms.org \n\n";
 
@@ -235,7 +235,7 @@ sub pandora_load_config {
 	$pa_config->{"mta_port"} = '25'; # Introduced on 2.0
 	$pa_config->{"mta_user"} = ''; # Introduced on 2.0
 	$pa_config->{"mta_pass"} = ''; # Introduced on 2.0
-	$pa_config->{"mta_auth"} = 'none'; # Introduced on 2.0  (Support LOGIN PLAIN CRAM-MD5 DIGEST-MD)
+	$pa_config->{"mta_auth"} = 'none'; # Introduced on 2.0 (Support LOGIN PLAIN CRAM-MD5 DIGEST-MD)
 	$pa_config->{"mta_from"} = 'pandora@localhost'; # Introduced on 2.0 
 
 	# nmap for recon OS fingerprinting and tcpscan (optional)
diff --git a/pandora_server/pandora_server_upgrade b/pandora_server/pandora_server_upgrade
index 9e2a402e6b..f70bac10a1 100644
--- a/pandora_server/pandora_server_upgrade
+++ b/pandora_server/pandora_server_upgrade
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# Pandora FMS Server Upgrader (c) 2008-2009 Artica ST
+# Pandora FMS Server Upgrader (c) 2008-2010 Artica ST
 # Linux Version (generic), for SuSe and Debian/Ubuntu only
 # other Linux distros could not work properly without modifications
 # Please see http://www.pandorafms.org
-# v3.0.1 Build 091218
+# v3.1.0 Build 100516
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
@@ -65,7 +65,7 @@ help () {
 
 # Script banner at start
 echo " "
-echo "Pandora FMS 3.0 Server Upgrade (c) 2009 Artica ST"
+echo "Pandora FMS 3.1 Server Upgrade (c) 2009-2010 Artica ST"
 echo "This program is licensed under GPL2 Terms. http://pandorafms.org"
 echo " "