diff --git a/html/images/os/mcafee.png b/html/images/os/mcafee.png
new file mode 100644
index 0000000000..b2d041e8e0
Binary files /dev/null and b/html/images/os/mcafee.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 538f321c67..cefa22c034 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1947,8 +1947,17 @@ $config['os'][$os]['over'][1]['text']  = 'Wifi Clients';
 $config['os'][$os]['over'][2]['graph'] = 'device_xirrus_rssi';
 $config['os'][$os]['over'][2]['text']  = 'Signal RSSI';
 
-
-
+// McAfee SIEM
+$os = 'nitro';
+$config['os'][$os]['text'] = 'McAfee SIEM Nitro';
+$config['os'][$os]['type'] = 'appliance';
+$config['os'][$os]['icon'] = 'mcafee';
+$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';
 
 // Graph Types
 require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';
diff --git a/includes/discovery/os/acsw.inc.php b/includes/discovery/os/acsw.inc.php
index f662254b9d..ac8118f0cf 100644
--- a/includes/discovery/os/acsw.inc.php
+++ b/includes/discovery/os/acsw.inc.php
@@ -7,9 +7,6 @@ if (!$os) {
     if (strstr($sysDescr, 'Application Control Engine')) {
         $os = 'acsw';
     }
-    if (strstr($sysDescr, 'ACE')) {
-        $os = 'acsw';
-    }
 }
 
 if (!$os) {
diff --git a/includes/discovery/os/nitro.inc.php b/includes/discovery/os/nitro.inc.php
new file mode 100644
index 0000000000..5e00d5668a
--- /dev/null
+++ b/includes/discovery/os/nitro.inc.php
@@ -0,0 +1,14 @@
+<?php
+
+// MaAfee SIEM Nitro
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.1.1')) {
+        $os = 'nitro';
+    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.3.1')) {
+        $os = 'nitro';
+    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.7.1')) {
+        $os = 'nitro';
+    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.11.1')) {
+        $os = 'nitro';
+    }
+}
diff --git a/includes/polling/os/nitro.inc.php b/includes/polling/os/nitro.inc.php
new file mode 100644
index 0000000000..ddbb25fb4b
--- /dev/null
+++ b/includes/polling/os/nitro.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+if ($device['sysObjectID'] == 'enterprises.23128.1000.1.1') {
+    $features = 'Enterprise Security Manager';
+} elseif ($device['sysObjectID'] == 'enterprises.23128.1000.3.1') {
+    $features = 'Event Receiver';
+} elseif ($device['sysObjectID'] == 'enterprises.23128.1000.7.1') {
+    $features = 'Enterprise Log Manager';
+} elseif ($device['sysObjectID'] == 'enterprises.23128.1000.11.1') {
+    $features = 'Advanced Correlation Engine';
+} else {
+    $features = 'Unknown';
+}
+
+// McAfee ACE 9.5.0
+if (preg_match('/^McAfee [A-Z]{3} ([^,]+)$/', $device['sysDescr'], $regexp_result)) {
+    $version  = $regexp_result[1];
+}