diff --git a/includes/discovery/mempools/nos.inc.php b/includes/discovery/mempools/nos.inc.php
index 3b86224ecc..a801e52af4 100644
--- a/includes/discovery/mempools/nos.inc.php
+++ b/includes/discovery/mempools/nos.inc.php
@@ -1,15 +1,15 @@
 <?php
 
 if ($device['os'] == "nos") {
-  echo("nos: ");
+    echo("nos: ");
 
-  $used 	= snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.6.0", "-Ovq");
-  $total 	= "100";
-  $free		= ($total - $used);
+    $used 	= snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.6.0", "-Ovq");
+    $total 	= "100";
+    $free		= ($total - $used);
 
-  $percent	= $used; 
+    $percent	= $used; 
 
-  if (is_numeric($used)) {
-    discover_mempool($valid_mempool, $device, 0, "nos", "Memory", "1", NULL, NULL);
-  }
-}
\ No newline at end of file
+    if (is_numeric($used)) {
+        discover_mempool($valid_mempool, $device, 0, "nos", "Memory", "1", NULL, NULL);
+    }
+}
diff --git a/includes/discovery/os/nos.inc.php b/includes/discovery/os/nos.inc.php
index 7fd7646d64..765f1a22bd 100644
--- a/includes/discovery/os/nos.inc.php
+++ b/includes/discovery/os/nos.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (strstr($sysDescr, "Brocade VDX")) { 
+    if (strstr($sysDescr, "Brocade VDX") || strstr($sysObjectId, '.1.3.6.1.4.1.1588.2.2.1.1.1.5') || stristr($sysDescr, 'Brocade Communications Systems')) { 
         $os = "nos"; 
     }
 }
diff --git a/includes/discovery/processors/nos.inc.php b/includes/discovery/processors/nos.inc.php
index 53bc6147a5..c0051e466d 100644
--- a/includes/discovery/processors/nos.inc.php
+++ b/includes/discovery/processors/nos.inc.php
@@ -1,14 +1,14 @@
 <?php
 
 if ($device['os'] == "nos") {
-  echo("nos : ");
+    echo("nos : ");
 
-  $descr = "CPU";
-  $usage = snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq");
+    $descr = "CPU";
+    $usage = snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq");
 
-  if (is_numeric($usage)) {
-    discover_processor($valid['processor'], $device, "1.3.6.1.4.1.1588.2.1.1.1.26.1", "0", "nos", $descr, "1", $usage, NULL, NULL);
-  }
+    if (is_numeric($usage)) {
+        discover_processor($valid['processor'], $device, "1.3.6.1.4.1.1588.2.1.1.1.26.1", "0", "nos", $descr, "1", $usage, NULL, NULL);
+    }
 }
 
-unset ($processors_array);
\ No newline at end of file
+unset ($processors_array);