diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 532d72fed1..9c6dd26334 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-08  Pablo de la Concepción <pablo.concepcion@artica.es>
+
+	* lib/PandoraFMS/GIS.pm, lib/PandoraFMS/GeoIP.pm: Modified to put
+	MaxMind GeoIP PurePerl GPL library into PandoraFMS package.
+
 2010-03-04  Sancho Lerena <slerena@artica.es>
 
 	* conf/pandora_server.conf: Several typos and better formating.
diff --git a/pandora_server/lib/PandoraFMS/GIS.pm b/pandora_server/lib/PandoraFMS/GIS.pm
index b34bd90af3..16d94ded1a 100644
--- a/pandora_server/lib/PandoraFMS/GIS.pm
+++ b/pandora_server/lib/PandoraFMS/GIS.pm
@@ -177,7 +177,7 @@ B<Returns>: I<undef> if there is not information available or a B<hash> with:
 sub get_reverse_geoip_file($$) {
 	my ($pa_config,$ip_addr) = @_;
 	if ($geoIPPurePerlavilable == 1) {
-		my $geoipdb = Geo::IP::PurePerl->open( $pa_config->{'recon_reverse_geolocation_file'}); 
+		my $geoipdb = PandoraFMS::GeoIP->open( $pa_config->{'recon_reverse_geolocation_file'}); 
 		if (defined($geoipdb)) {
     		my $region_info = $geoipdb->get_city_record_as_hash($ip_addr);	
     		logger($pa_config, "Region info found for IP '$ip_addr' is: country:".$region_info->{'country_name'}." region:".$region_info->{'region'}." city:".$region_info->{'city'}." longitude:".$region_info->{'longitude'}." latitude:".$region_info->{'latitude'}, 8);
diff --git a/pandora_server/lib/PandoraFMS/GeoIP.pm b/pandora_server/lib/PandoraFMS/GeoIP.pm
index c8547ef367..342c565179 100644
--- a/pandora_server/lib/PandoraFMS/GeoIP.pm
+++ b/pandora_server/lib/PandoraFMS/GeoIP.pm
@@ -1,4 +1,4 @@
-package Geo::IP::PurePerl;
+package PandoraFMS::GeoIP;
 
 use strict;
 use FileHandle;