diff --git a/includes/discovery/mempools/serveriron.inc.php b/includes/discovery/mempools/serveriron.inc.php
index ba31ebd63..b2b8b69ee 100644
--- a/includes/discovery/mempools/serveriron.inc.php
+++ b/includes/discovery/mempools/serveriron.inc.php
@@ -1,15 +1,11 @@
 <?php
 
-if ($device['os'] == "serveriron") {
-    echo("nos: ");
+if ($device['os'] == 'serveriron') {
+    echo 'ServerIron Dynamic: ';
 
-    $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 = snmp_get($device, 'snAgGblDynMemUtil.0', '-OvQ', 'FOUNDRY-SN-AGENT-MIB');
 
-    $percent	= $used; 
-
-    if (is_numeric($used)) {
-        discover_mempool($valid_mempool, $device, 0, "serveriron", "Memory", "1", NULL, NULL);
+    if (is_numeric($percent)) {
+        discover_mempool($valid_mempool, $device, 0, 'ServerIron', 'Dynamic Memory', '1', null, null);
     }
 }
diff --git a/includes/discovery/processors/serveriron.inc.php b/includes/discovery/processors/serveriron.inc.php
index 1bc8b30e9..e1d86daf9 100644
--- a/includes/discovery/processors/serveriron.inc.php
+++ b/includes/discovery/processors/serveriron.inc.php
@@ -1,14 +1,39 @@
 <?php
 
-if ($device['os'] == "serveriron") {
-    echo("serveriron : ");
+if ($device['os'] == 'serveriron') {
+    echo 'ServerIron : ';
+    $processors_array = snmpwalk_cache_triple_oid($device, 'snAgentCpuUtilEntry', $processors_array, 'FOUNDRY-SN-AGENT-MIB');
+    d_echo($processors_array);
 
-    $descr = "CPU";
-    $usage = snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq");
+    foreach ($processors_array as $index => $entry) {
+        if (($entry['snAgentCpuUtilValue'] || $entry['snAgentCpuUtil100thPercent']) && $entry['snAgentCpuUtilInterval'] == '300') {
+            // $entPhysicalIndex = $entry['cpmCPUTotalPhysicalIndex'];
+            if ($entry['snAgentCpuUtil100thPercent']) {
+                $usage_oid = '.1.3.6.1.4.1.1991.1.1.2.11.1.1.6.'.$index;
+                $usage     = $entry['snAgentCpuUtil100thPercent'];
+                $precision = 100;
+            }
+            else if ($entry['snAgentCpuUtilValue']) {
+                $usage_oid = '.1.3.6.1.4.1.1991.1.1.2.11.1.1.4.'.$index;
+                $usage     = $entry['snAgentCpuUtilValue'];
+                $precision = 100;
+            }
 
-    if (is_numeric($usage)) {
-        discover_processor($valid['processor'], $device, "1.3.6.1.4.1.1588.2.1.1.1.26.1", "0", "serveriron", $descr, "1", $usage, NULL, NULL);
-    }
-}
+            list($slot, $instance, $interval) = explode('.', $index);
 
-unset ($processors_array);
+            $descr_oid   = 'snAgentConfigModuleDescription.'.$entry['snAgentCpuUtilSlotNum'];
+            $descr       = snmp_get($device, $descr_oid, '-Oqv', 'FOUNDRY-SN-AGENT-MIB');
+            $descr       = str_replace('"', '', $descr);
+            list($descr) = explode(' ', $descr);
+
+            $descr = 'Slot '.$entry['snAgentCpuUtilSlotNum'].' '.$descr;
+            $descr = $descr.' ['.$instance.']';
+
+            if (!strstr($descr, 'No') && !strstr($usage, 'No') && $descr != '') {
+                discover_processor($valid['processor'], $device, $usage_oid, $index, 'serveriron', $descr, $precision, $usage, $entPhysicalIndex, null);
+            }
+        }//end if
+    }//end foreach
+}//end if
+
+unset($processors_array);
diff --git a/includes/polling/mempools/serveriron.inc.php b/includes/polling/mempools/serveriron.inc.php
index ce7898625..ed315eff8 100644
--- a/includes/polling/mempools/serveriron.inc.php
+++ b/includes/polling/mempools/serveriron.inc.php
@@ -1,7 +1,7 @@
 <?php
 
-// Somewhat of an uggly hack since Server doesn't support fetching total memory of the device over SNMP
-// Given OID returns usage in percent so we set total to 100 in order to get a proper graph
-$mempool['total'] 	= "100";
-$mempool['used'] 	= snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.6.0", "-Ovq");
-$mempool['free'] 	= ($mempool['total'] - $mempool['used']); 
+// Simple hard-coded poller for Brocade Ironware Dynamic Memory (old style)
+// Yes, it really can be this simple.
+$mempool['total'] = snmp_get($device, 'snAgGblDynMemTotal.0', '-OvQ', 'FOUNDRY-SN-AGENT-MIB');
+$mempool['free']  = snmp_get($device, 'snAgGblDynMemFree.0', '-OvQ', 'FOUNDRY-SN-AGENT-MIB');
+$mempool['used']  = ($mempool['total'] - $mempool['free']);
diff --git a/includes/polling/processors/serveriron.inc.php b/includes/polling/processors/serveriron.inc.php
deleted file mode 100644
index 7ae1d9c07..000000000
--- a/includes/polling/processors/serveriron.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$proc = trim(snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq"),'"');