diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4c6688186e..acc39f4f55 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-11  Sancho Lerena <slerena@artica.es>
+
+	* pandoradb_data.sql: Added new OS: android.
+	
+	* operation/agentes/estado_generalagente.php: Show description in GIS
+	data when it's available.
+
+	* images/os_icons/android.png,
+	images/networkmap/15.png: New icons for Android OStype.
+
 2011-02-07  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* pandoradb.sql: cleaned source code.
diff --git a/pandora_console/images/networkmap/15.png b/pandora_console/images/networkmap/15.png
new file mode 100644
index 0000000000..6121f04c80
Binary files /dev/null and b/pandora_console/images/networkmap/15.png differ
diff --git a/pandora_console/images/os_icons/android.png b/pandora_console/images/os_icons/android.png
new file mode 100644
index 0000000000..da95c5d4e0
Binary files /dev/null and b/pandora_console/images/os_icons/android.png differ
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index e20c8e80c7..1c91af5627 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -142,12 +142,19 @@ if ($config['activate_gis']) {
 	
 	echo '<tr><td class="datos2"><b>'.__('Position (Long, Lat)'). '</b></td>';
     echo '<td class="datos2" colspan="2">';
+
     if ($dataPositionAgent === false) {
-    	echo __('There is no GIS data.');
+        echo __('There is no GIS data.');
     }
     else {
-    	echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente='.$id_agente.'">'.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].'</a>';
+        echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente='.$id_agente.'">';
+        if ($dataPositionAgent['description'] != "")
+                echo $dataPositionAgent['description'];
+        else
+                echo $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
+        echo "</a>";
     }
+
     echo '</td></tr>';
 }
 // Last contact
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 9aa826dc41..b89a881cae 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -97,7 +97,8 @@ INSERT INTO `tconfig_os` VALUES
 (11,'Network','Pandora FMS Network Agent','network.png'),
 (12,'Web Server','Web Server/Application','network.png'),
 (13,'Octopods','Octopods Pandora FMS Hardware Agent','network.png'),
-(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png');
+(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png'),
+(15,'Android','Android agent','android.png');
 UNLOCK TABLES;
 
 
@@ -260,7 +261,7 @@ INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,0,'admin');
 
 INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1);
 
-INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()),
+INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A l/ot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()),
 (2,'admin','New GIS Feature','Try our new GIS representation, activate GIS in Setup to see new available options.',NOW());
 
 INSERT INTO tmodule VALUES (1,'Agent&#x20;module');