diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index d007b20738..d2ea0087ed 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -408,7 +408,18 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 $config['os'][$os]['icon']              = "cisco";
 
-
+// Brocade NOS
+$os = "nos";
+$config['os'][$os]['text']              = "Brocade NOS";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['ifname']            = 1;
+$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']   = "CPU Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+$config['os'][$os]['icon']              = "brocade";
 
 // Cisco Small Business
 
diff --git a/includes/discovery/os/nos.inc.php b/includes/discovery/os/nos.inc.php
new file mode 100644
index 0000000000..de4141cb66
--- /dev/null
+++ b/includes/discovery/os/nos.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.1588.2.2.1.1.1.5")) {
+        $os = "nos";
+    }
+}
diff --git a/includes/polling/os/nos.inc.php b/includes/polling/os/nos.inc.php
new file mode 100644
index 0000000000..ddf00a2264
--- /dev/null
+++ b/includes/polling/os/nos.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+//SNMPv2-MIB::sysDescr.0  Brocade VDX Switch.
+if (preg_match("/Brocade ([\s\d\w]+)/", $poll_device['sysDescr'], $hardware)) {
+    $hardware = $hardware[1];
+}