diff --git a/config.php.default b/config.php.default
index 2f30e48ce..8dbe127f6 100755
--- a/config.php.default
+++ b/config.php.default
@@ -87,6 +87,7 @@ $config['int_l2tp'] 		= 0;  # Enable L2TP Port Types
 
 $config['show_locations'] 	= 1;  # Enable Locations on menu
 $config['show_services']        = 1;  # Enable Services on menu
+$config['show_printers']        = 0;  # Enable Printers Device Type on menu
 
 $config['ports_page_default']	= "details/";  
 # Default devices ports page display type. "details/", "graphs/bits/", etc
diff --git a/discovery.php b/discovery.php
index 09e0bb38b..7caffcbde 100755
--- a/discovery.php
+++ b/discovery.php
@@ -142,6 +142,11 @@ while ($device = mysql_fetch_array($device_query)) {
     if ($device['type'] == "unknown") { $device['type'] = 'firewall'; }
   }
 
+  if ($device['os'] == "dell-laser")
+  {
+    if ($device['type'] == "unknown") { $device['type'] = 'printer'; }
+  }
+
   $update_query  = "UPDATE `devices` SET ";
   $update_query .= " `last_discovered` = NOW(), `type` = '" . $device['type'] . "'";
   $update_query .= " WHERE `device_id` = '" . $device['device_id'] . "'";
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 07de735be..a105cd007 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -50,6 +50,14 @@
         <li><a href="devices/server/"><img src="images/16/server.png" border="0" align="absmiddle" /> Servers</a></li>
         <li><a href="devices/network/"><img src="images/16/arrow_switch.png" border="0" align="absmiddle" /> Network</a></li>
         <li><a href="devices/firewall/"><img src="images/16/shield.png" border="0" align="absmiddle" /> Firewalls</a></li>
+<?php
+if (isset($config['show_printers']) && $config['show_printers'])
+{
+?>
+        <li><a href="devices/printer/"><img src="images/16/printer.png" border="0" align="absmiddle" /> Printers</a></li>
+<?php
+}
+?>
         <li><hr width="140" /></li>
         <li><a href="devices/alerted/"><img src="images/16/server_error.png" border="0" align="absmiddle" /> Alerts (<?php echo $device_alerts ?>)</a></li>
 <?php
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index 5a9f50bf0..48d01e612 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -23,6 +23,7 @@ if($device['type'] == 'server') { $server_select = "selected"; }
 if($device['type'] == 'network') { $network_select = "selected"; }
 if($device['type'] == 'firewall') { $firewall_select = "selected"; }
 if($device['type'] == 'workstation') { $workstation_select = "selected"; }
+if($device['type'] == 'printer') { $printer_select = "selected"; }
 if($device['type'] == 'other' || $device['type'] == 'unknown') { $other_select = "selected"; }
 
 echo("<table cellpadding=0 cellspacing=0><tr><td>
@@ -62,6 +63,7 @@ echo("<table cellpadding=0 cellspacing=0><tr><td>
           <option value='network' $network_select>Network</option>
           <option value='firewall' $firewall_select>Firewall</option>
           <option value='workstation' $workstation_select>Workstation</option>
+          <option value='printer' $printer_select>Printer</option>
           <option value='other' $other_select>Other</option>
         </select>
       </td>