diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 8a62fb09dd..7262db8d96 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Pablo de la Concepción <pablo.concepcion@artica.es>
+
+	* conf/pandora_server.conf: Corrected typo 
+	
 2010-03-04  Pablo de la Concepción <pablo.concepcion@artica.es>
 
 	* lib/PandoraFMS/Server.pm: Added spaces between server name and server
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 22c392c663..f9b811a4ce 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -234,7 +234,7 @@ max_queue_files 250
 # restart_delay 60
 
 
-# Flag to activate GIS (positional infomration for agents and maps) by default it is desactivated
+# Flag to activate GIS (positional information for agents and maps) by default it is desactivated
 # activate_gis 0
 
 # Radius of the Error in meters to consider two gis locations as the same location.