diff --git a/html/images/os/calix.png b/html/images/os/calix.png
new file mode 100644
index 0000000000..156c0f8530
Binary files /dev/null and b/html/images/os/calix.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 07550b2e3e..6013d2caa4 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -311,6 +311,16 @@ $config['os'][$os]['icon'] = 'barracuda';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Traffic';
+// Calix
+$os = 'calix';
+$config['os'][$os]['text'] = 'Calix E7';
+$config['os'][$os]['type'] = 'network';
+$config['os'][$os]['ifname'] = 1;
+$config['os'][$os]['empty_ifdescr'] = 1;
+$config['os'][$os]['icon'] = 'calix';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
+
// Cisco OSes
$os = 'ios';
$config['os'][$os]['group'] = 'cisco';
diff --git a/includes/discovery/os/calix.inc.php b/includes/discovery/os/calix.inc.php
new file mode 100644
index 0000000000..40ca58fdbb
--- /dev/null
+++ b/includes/discovery/os/calix.inc.php
@@ -0,0 +1,6 @@
+