diff --git a/discovery.php b/discovery.php
index 411960042..cc06b081f 100755
--- a/discovery.php
+++ b/discovery.php
@@ -131,7 +131,7 @@ while ($device = mysql_fetch_array($device_query))
   include("includes/discovery/ucd-diskio.inc.php");
   include("includes/discovery/services.inc.php");
 
-  if ($device['type'] == "unknown")
+  if ($device['type'] == "unknown" || $device['type'] == "")
   {
     if ($config['os'][$device['os']]['type'])
     {
diff --git a/html/images/os/jetdirect.png b/html/images/os/jetdirect.png
new file mode 100755
index 000000000..600dc4e55
Binary files /dev/null and b/html/images/os/jetdirect.png differ
diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index 1e9bb3092..a9832959e 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -13,11 +13,11 @@ $valid_toner = array();
 
 echo("Toner : ");
 
-if ($device['os'] == "dell-laser") 
+if ($device['os'] == "dell-laser" || $device['os'] == "jetdirect") 
 {
   $oids = trim(snmp_walk($device, "SNMPv2-SMI::mib-2.43.12.1.1.2.1 ", "-OsqnU"));
   if ($debug) { echo($oids."\n"); }
-  if ($oids) echo("Dell ");
+  if ($oids) echo("Jetdirect ");
   foreach(explode("\n", $oids) as $data) 
   {
     $data = trim($data);
@@ -35,7 +35,7 @@ if ($device['os'] == "dell-laser")
         $current       = snmp_get($device, $toner_oid, "-Oqv");
         $capacity      = snmp_get($device, $capacity_oid, "-Oqv");
         $current       = $current / $capacity * 100;
-        $type          = "dell-laser";
+        $type          = "jetdirect";
         echo discover_toner($valid_toner,$device, $toner_oid, $index, $type, $descr, $capacity, $current);
       }
     }
diff --git a/includes/static-config.php b/includes/static-config.php
index cf5b05ede..af6feaa81 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -150,6 +150,13 @@ $config['os']['dell-laser']['overtext']    = "Toner";
 $config['os']['dell-laser']['ifname']	   = 1;
 $config['os']['dell-laser']['type']        = "printer";
 
+$config['os']['jetdirect']['group'] 	   = "printer";
+$config['os']['jetdirect']['text']  	   = "HP Printer";
+$config['os']['jetdirect']['overgraph'][]  = "device_toner";
+$config['os']['jetdirect']['overtext']     = "Toner";
+$config['os']['jetdirect']['ifname']	   = 1;
+$config['os']['jetdirect']['type']         = "printer";
+
 $config['os']['3com']['text']             = "3Com";
 $config['os']['3com']['overgraph'][]      = "";
 $config['os']['3com']['overtext']         = "";