diff --git a/html/pages/inventory.php b/html/pages/inventory.php
index 213a70b3e..05ad3e096 100644
--- a/html/pages/inventory.php
+++ b/html/pages/inventory.php
@@ -1,13 +1,67 @@
+<div style="background-color: #eeeeee; padding: 10px;">
+<form method="post" action="">
+  <label><strong>Descr</strong>
+    <input type="text" name="string" id="string" value="<?php  echo($_POST['string']); ?>" />
+  </label>
+  <label>
+    <strong>Part No</strong>
+    <select name="part" id="part">
+      <option value="">All Parts</option>
+      <?php
+        $query = mysql_query("SELECT `entPhysicalModelName` FROM `entPhysical` GROUP BY `entPhysicalModelName` ORDER BY `entPhysicalModelName`");
+        while($data = mysql_fetch_array($query)) {
+          echo("<option value='".$data['entPhysicalModelName']."'");
+          if($data['entPhysicalModelName'] == $_POST['part']) { echo("selected"); }
+          echo(">".$data['entPhysicalModelName']."</option>");
+        }
+      ?>
+    </select>
+  </label>
+  <label><strong>Serial</strong>
+    <input type="text" name="serial" id="serial" value="<?php  echo($_POST['serial']); ?>" />
+  </label>
+  <label>
+    <strong>Device</strong>
+    <select name="device" id="device">
+      <option value="">All Devices</option>
+      <?php
+        $query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`");
+        while($data = mysql_fetch_array($query)) {
+          echo("<option value='".$data['device_id']."'");
+
+          if($data['device_id'] == $_POST['device']) { echo("selected"); }
+
+          echo(">".$data['hostname']."</option>");
+        }
+      ?>
+    </select>
+  </label>
+
+  <input type=submit value=Search>
+
+</form>
+</div>
+
+
 <?
 
-$sql = "SELECT * from entPhysical AS E, devices AS D WHERE E.device_id = D.device_id";
+if($_POST['string']) {
+  $where = " AND E.entPhysicalDescr LIKE '%".$_POST['string']."%'";
+}
 
-if($_POST['search']) { $sstring = $_POST['search']; $sql = "SELECT * from entPhysical AS E, devices AS D WHERE E.entPhysicalModelName LIKE '$sstring' AND E.device_id = D.device_id"; }
+if($_POST['part']) {
+  $where .= " AND E.entPhysicalModelName = '".$_POST['part']."'";
+}
 
-echo("<div style='float: right;'><form method=post><b>Search</b> 
-                                   <input name=search>$sstring</input>
-                                   <input type=submit name=submit value=Search></form></div>");
+if($_POST['serial']) {
+  $where .= " AND E.entPhysicalSerialNum LIKE '%".$_POST['serial']."%'";
+}
 
+if($_POST['device']) {
+  $where .= " AND D.device_id = '".$_POST['device']."'";
+}
+
+$sql = "SELECT * from entPhysical AS E, devices AS D WHERE E.device_id = D.device_id $where ORDER BY D.hostname";
 
 $query = mysql_query($sql);
 echo("<table cellspacing=0 cellpadding=2 width=100%>");
@@ -16,7 +70,8 @@ echo("<tr><th>Hostname</th><th>Description</th><th>Name</th><th>Part No</th><th>
 
 while($entry = mysql_fetch_array($query)) { 
 if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
-echo("<tr style=\"background-color: $bg\"><td>" . generatedevicelink($entry, shortHost($entry['hostname'])) . "</td><td>" . $entry['entPhysicalDescr']  . "</td><td>" . $entry['entPhysicalName']  . "</td><td>" . $entry['entPhysicalModelName']  . "</td><td>" . $entry['entPhysicalSerialNum'] . "</td></tr>");
+echo("<tr style=\"background-color: $bg\"><td>" . generatedevicelink($entry, shortHost($entry['hostname'])) . "</td><td>" . $entry['entPhysicalDescr']  . 
+     "</td><td>" . $entry['entPhysicalName']  . "</td><td>" . $entry['entPhysicalModelName']  . "</td><td>" . $entry['entPhysicalSerialNum'] . "</td></tr>");
 
 }
 echo("</table>");