diff --git a/html/images/os/quanta.png b/html/images/os/quanta.png
new file mode 100644
index 000000000..f3cb0db4a
Binary files /dev/null and b/html/images/os/quanta.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 16e3482e6..d0ef00f20 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -528,6 +528,14 @@ $config['os'][$os]['bad_if'][]         = 'cpu';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 
+//Quanta switches
+$os = 'quanta';
+$config['os'][$os]['text']             = 'Quanta';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'quanta';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+
 $os = 'netonix';
 $config['os'][$os]['text']             = 'Netonix';
 $config['os'][$os]['type']             = 'network';
diff --git a/includes/discovery/os/edgeswitch.inc.php b/includes/discovery/os/edgeswitch.inc.php
index c3cf06bee..c09f86dc2 100644
--- a/includes/discovery/os/edgeswitch.inc.php
+++ b/includes/discovery/os/edgeswitch.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.4413')) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.4413')  && !stristr($sysDescr, 'vxworks')) {
         $os = 'edgeswitch';
     }
 }
diff --git a/includes/discovery/os/quanta.inc.php b/includes/discovery/os/quanta.inc.php
new file mode 100644
index 000000000..1b3f7887d
--- /dev/null
+++ b/includes/discovery/os/quanta.inc.php
@@ -0,0 +1,6 @@
+<?php
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.4413') && stristr($sysDescr, 'vxworks')) {
+        $os = 'quanta';
+    }
+}
diff --git a/includes/polling/os/quanta.inc.php b/includes/polling/os/quanta.inc.php
new file mode 100644
index 000000000..60e71cde1
--- /dev/null
+++ b/includes/polling/os/quanta.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+list($hardware, $features, $version) = explode(',', $poll_device['sysDescr']);