diff --git a/AUTHORS.md b/AUTHORS.md
index 852f62e722..d216d55e29 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -123,6 +123,7 @@ LibreNMS contributors:
 - Bennett Blodinger <bennett.blodinger@gmail.com> (benwa)
 - Michael Hansen <nerdalertdk@gmail.com> (nerdalertdk)
 - Daniel Cox <danielcoxman@gmail.com> (ospfbgp) 
+- Michael Van Delft <librenms@xo.tc> (HybridAU)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by:
diff --git a/html/images/os/lanier.png b/html/images/os/lanier.png
new file mode 100644
index 0000000000..64165b852a
Binary files /dev/null and b/html/images/os/lanier.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4f3a197079..0bc735c47b 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1501,6 +1501,15 @@ $config['os'][$os]['icon']             = 'ricoh';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
 
+// lanier is a rebadged ricoh
+$os = 'lanier';
+$config['os'][$os]['group']            = 'printer';
+$config['os'][$os]['text']             = 'Lanier Printer';
+$config['os'][$os]['type']             = 'printer';
+$config['os'][$os]['icon']             = 'lanier';
+$config['os'][$os]['over'][0]['graph'] = 'device_toner';
+$config['os'][$os]['over'][0]['text']  = 'Toner';
+
 $os = 'nrg';
 $config['os'][$os]['group']            = 'printer';
 $config['os'][$os]['text']             = 'NRG Printer';
@@ -1534,13 +1543,6 @@ $config['os'][$os]['icon']             = 'hp';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
 
-$os = 'richoh';
-$config['os'][$os]['group']            = 'printer';
-$config['os'][$os]['text']             = 'Ricoh Printer';
-$config['os'][$os]['type']             = 'printer';
-$config['os'][$os]['over'][0]['graph'] = 'device_toner';
-$config['os'][$os]['over'][0]['text']  = 'Toner';
-
 $os = 'okilan';
 $config['os'][$os]['group']       = 'printer';
 $config['os'][$os]['text']        = 'OKI Printer';
diff --git a/includes/discovery/os/lanier.inc.php b/includes/discovery/os/lanier.inc.php
new file mode 100644
index 0000000000..01724eb591
--- /dev/null
+++ b/includes/discovery/os/lanier.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysDescr, 'LANIER')) {
+        $os = 'lanier';
+    }
+}
diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index ddd742013e..4ea234329a 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -22,7 +22,7 @@ if ($device['os_group'] == 'printer') {
             $index           = $split_oid[(count($split_oid) - 1)];
             if (is_numeric($role)) {
                 //ricoh using private oids to expose toner levels
-                if ($os == 'ricoh' || $os == 'nrg') {
+                if ($os == 'ricoh' || $os == 'nrg' || $os == 'lanier') {
                     $toner_oid = ".1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.$index";
                     $descr_oid = ".1.3.6.1.4.1.367.3.2.1.2.24.1.1.3.$index";
                 } else {
@@ -37,14 +37,14 @@ if ($device['os_group'] == 'printer') {
                     $current  = snmp_get($device, $toner_oid, '-Oqv');
 
                     //ricoh private mibs returns values as percent, no capacity is disclosed as it is not needed
-                    if ($os == 'ricoh') {
+                    if ($os == 'ricoh' || $os == 'lanier') {
                         $capacity = 100;
                     } else {
                         $capacity = snmp_get($device, $capacity_oid, '-Oqv');
                     }
 
                     //fix for ricoh devices returning garbage and devices returning percentage
-                    if ($os == 'ricoh' || $os == 'nrg') {
+                    if ($os == 'ricoh' || $os == 'nrg' || $os == 'lanier') {
                         if ($current == '-3') {
                             $current = 50;
                         } elseif ($current == '-100') {