diff --git a/html/pages/device.php b/html/pages/device.php
index 88589319c..2ffd013b7 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -138,17 +138,23 @@ if($_SESSION[userlevel] >= "5" && mysql_result(mysql_query("SELECT count(*) FROM
 }
 
 if($config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$_GET['id']."'"), 0) > '0') {
-
   echo("<li class=" . $select['entphysical'] . ">
   <a href='".$config['base_url']."/device/" . $device['device_id'] . "/entphysical/'>
     <img src='images/16/bricks.png' align=absmiddle border=0> Inventory
   </a>
 </li>
 ");
-
-
+} elseif ( $config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `hrDevice` WHERE device_id = '".$_GET['id']."'"), 0) > '0') {
+  echo("<li class=" . $select['hrdevice'] . ">
+  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/hrdevice/'>
+    <img src='images/16/bricks.png' align=absmiddle border=0> Inventory
+  </a>
+</li>
+");
 }
 
+
+
 #if(mysql_result(mysql_query("select count(storage_id) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0) > '0') {
 #  echo("
 #<li class=" . $select['storage'] . ">
diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php
new file mode 100644
index 000000000..b998bcdcb
--- /dev/null
+++ b/html/pages/device/hrdevice.inc.php
@@ -0,0 +1,37 @@
+<?php
+
+echo("<table width=100%>");
+
+$hrdevices = mysql_query("SELECT * FROM `hrDevice` WHERE `device_id` = '".$device['device_id']."'");
+while($hrdevice = mysql_fetch_array($hrdevices)) {
+
+  echo("<tr><td>".$hrdevice['hrDeviceIndex']."</td>");
+
+if($hrdevice['hrDeviceType'] == "hrDeviceProcessor") {
+  $proc_url   = "?page=device/".$device['device_id']."/health/hrprocessors/";
+  $proc_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$hrdevice['hrDeviceDescr'];
+  $proc_popup .= "</div><img src=\'graph.php?id=" . $hrdevice['hrDevice_id'] . "&type=hrProcessor&from=$month&to=$now&width=400&height=125\'>";
+  $proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
+  echo("<td><a href='#' $proc_popup>".$hrdevice['hrDeviceDescr']."</a></td>");
+} elseif ($hrdevice['hrDeviceType'] == "hrDeviceNetwork") {
+  $int = str_replace("network interface ", "", $hrdevice['hrDeviceDescr']);
+  $interface = mysql_fetch_array(mysql_query("SELECT * FROM interfaces WHERE device_id = '".$device['device_id']."' AND ifDescr = '".$int."'")); 
+  if($interface['ifIndex']) {
+  echo("<td>".generateiflink($interface)."</td>");
+  } else {
+    echo("<td>".$hrdevice['hrDeviceDescr']."</td>");
+  }
+} else {
+  echo("<td>".$hrdevice['hrDeviceDescr']."</td>");
+}
+
+  echo("<td>".$hrdevice['hrDeviceType']."</td><td>".$hrdevice['hrDeviceStatus']."</td>");
+  echo("<td>".$hrdevice['hrDeviceErrors']."</td><td>".$hrdevice['hrProcessorLoad']."</td>");
+  echo("</tr>");
+
+}
+
+echo("</table>");
+
+?>
+