diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 52b214a395..3bd4c4ad20 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17 Javier Lanz <javier.lanz@artica.es>
+	* godmode/gis_maps/index.php: Show only user's GIS maps
+	
+	Fix: #3183432
+
 2011-02-17  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/help/en/help_agent_status.php,
diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php
index 360f006354..cf2deced80 100644
--- a/pandora_console/godmode/gis_maps/index.php
+++ b/pandora_console/godmode/gis_maps/index.php
@@ -80,8 +80,13 @@ $defaultMapId = null;
 if (!$maps) {
 	echo '<div class="nf">'.('No maps defined').'</div>';
 } else {
+	$own_info = get_user_info($config['id_user']);
 	foreach ($maps as $map) {
-		
+		if (!check_acl ($config["id_user"], $map["group_id"], "IR")) {
+			continue;
+		}
+		if ($map['group_id'] == 0 && (!$own_info['is_admin'] || !give_acl ($config['id_user'], 0, "PM")))
+			continue;
 		$checked = false;
 		if ($map['default_map']) {
 			$checked = true;