diff --git a/database-update.sql b/database-update.sql
index 187bc0c869..a1ca53a5ac 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -26,3 +26,5 @@ DROP TABLE `fanspeed`;
 DROP TABLE `temperature`;
 DROP TABLE `voltage`;
 DROP TABLE `current`;
+ALTER TABLE  `sensors` ADD  `entPhysicalIndex` VARCHAR( 16 ) NULL;
+ALTER TABLE `sensors`  ADD `entPhysicalIndex_measured` VARCHAR(16) NULL;
diff --git a/includes/discovery/temperatures/cisco-entity-sensor.inc.php b/includes/discovery/temperatures/cisco-entity-sensor.inc.php
new file mode 100644
index 0000000000..f2bd8aa223
--- /dev/null
+++ b/includes/discovery/temperatures/cisco-entity-sensor.inc.php
@@ -0,0 +1,37 @@
+<?php
+
+global $valid_temp;
+  
+if ($device['os'] == "ios" || $device['os_group'] == "ios") 
+{
+  echo("CISCO-ENTITY-SENSOR");
+
+  $oids = array();  
+
+  $oids = snmpwalk_cache_multi_oid($device, "entSensorType", $oids, "CISCO-ENTITY-SENSOR-MIB");
+  $oids = snmpwalk_cache_multi_oid($device, "entSensorScale", $oids, "CISCO-ENTITY-SENSOR-MIB");
+  $oids = snmpwalk_cache_multi_oid($device, "entSensorValue", $oids, "CISCO-ENTITY-SENSOR-MIB");
+  $oids = snmpwalk_cache_multi_oid($device, "entSensorMeasuredEntity", $oids, "CISCO-ENTITY-SENSOR-MIB");
+
+  if(is_array($oids[$device['device_id']]))
+  {
+    foreach($oids[$device[device_id]] as $index => $entry)
+    {
+      #echo("[" . $entry['entSensorType'] . "|" . $entry['entSensorValue']. "|" . $index . "]");
+
+      if($entry['entSensorType'] == "celsius" && is_numeric($entry['entSensorValue']) && is_numeric($index) && $entry['entSensorValue'] > "0" && $entry['entSensorValue'] < "1000")
+      {
+        $entPhysicalIndex = $index;
+	$entPhysicalIndex_measured = $entry['entSensorMeasuredEntity']; 
+	$descr = snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-MIB");
+        $oid = ".1.3.6.1.4.1.9.9.91.1.1.1.1.4.".$index;
+        $current = $entry['entSensorValue'];
+	
+        discover_temperature($valid_temp, $device, $oid, $index, "cisco-entity-sensor", $descr, "1", NULL, NULL, $current);
+      }
+    }
+  }
+}
+
+
+?>