diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 066f5a2c1..661fe4242 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1157,7 +1157,14 @@ $config['os'][$os]['text']             = 'Samsung Printer';
 $config['os'][$os]['type']             = 'printer';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
-    
+
+$os ='canonprinter';
+$config['os'][$os]['group']            = 'printer';
+$config['os'][$os]['text']             = 'Canon Printer';
+$config['os'][$os]['type']             = 'printer';
+$config['os'][$os]['over'][0]['graph'] = 'device_toner';
+$config['os'][$os]['over'][0]['text']  = 'Toner';
+
 $os = '3com';
 $config['os'][$os]['text']             = '3Com';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
diff --git a/includes/discovery/os/canon-printer.inc.php b/includes/discovery/os/canon-printer.inc.php
new file mode 100644
index 000000000..3c4e1c2b4
--- /dev/null
+++ b/includes/discovery/os/canon-printer.inc.php
@@ -0,0 +1,7 @@
+<?php
+if (!$os) {
+    // Canon Multifunction Printer/Scanner
+    if (strstr($sysDescr, 'Canon MF')) {
+        $os = 'canonprinter';
+    }
+}