diff --git a/html/images/os/bdcom.png b/html/images/os/bdcom.png
new file mode 100644
index 0000000000..5ea801b716
Binary files /dev/null and b/html/images/os/bdcom.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 3a15534beb..bb5adc1885 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -368,6 +368,18 @@ $config['os'][$os]['icon']             = 'calix';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 
+// BDCom
+$os = 'bdcom';
+$config['os'][$os]['text']             = 'Calix E7';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'bdcom';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Cisco OSes
 $os = 'ios';
 $config['os'][$os]['group']            = 'cisco';
diff --git a/includes/discovery/os/bdcom.inc.php b/includes/discovery/os/bdcom.inc.php
new file mode 100644
index 0000000000..ac917fb90f
--- /dev/null
+++ b/includes/discovery/os/bdcom.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.3320.1.185')) {
+        $os = 'bdcom';
+    }
+}
diff --git a/includes/polling/os/bdcom.inc.php b/includes/polling/os/bdcom.inc.php
new file mode 100644
index 0000000000..563f180f07
--- /dev/null
+++ b/includes/polling/os/bdcom.inc.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+BDCOM(tm) S2524C Software, Version 2.1.0A Build 5721
+Compiled: 2011-11-1 15:57:26 by SYS
+ROM: System Bootstrap,Version 0.3.2,Serial num:27072980
+**/
+
+preg_match('/BDCOM\(tm\) ([A-Z0-9]+) Software, Version (.*)\nCompiled: (.*)\n(.*),Serial num:([0-9]+)/', $poll_device['sysDescr'], $matches);
+$hardware = $matches['1'];
+
+$version  = $matches['2'];
+$serial   = $matches['5'];