diff --git a/html/images/os/oracle.png b/html/images/os/oracle.png
new file mode 100644
index 0000000000..6a4235fc65
Binary files /dev/null and b/html/images/os/oracle.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 3d11f2690a..2c1d00df4e 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1692,6 +1692,18 @@ $config['os'][$os]['text']             = 'Infoblox';
 $config['os'][$os]['type']             = 'appliance';
 $config['os'][$os]['icon']             = 'infoblox';
 
+// Oracle ILOM
+$os = 'oracle-ilom';
+$config['os'][$os]['text']             = 'Oracle ILOM';
+$config['os'][$os]['type']             = 'appliance';
+$config['os'][$os]['icon']             = 'oracle';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = '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';
+
 // Lenovo EMC (NAS)
 $os = 'lenovoemc';
 $config['os'][$os]['type']             = 'storage';
diff --git a/includes/discovery/os/oracle-ilom.inc.php b/includes/discovery/os/oracle-ilom.inc.php
new file mode 100644
index 0000000000..03e6e3772b
--- /dev/null
+++ b/includes/discovery/os/oracle-ilom.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.42.2.200.2.1.1')) {
+        $os = 'oracle-ilom';
+    }
+}
diff --git a/includes/polling/os/oracle-ilom.inc.php b/includes/polling/os/oracle-ilom.inc.php
new file mode 100644
index 0000000000..60166f3b34
--- /dev/null
+++ b/includes/polling/os/oracle-ilom.inc.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (preg_match('/^(.*), ILOM v(.*), (.*)/', $poll_device['sysDescr'], $regexp_result)) {
+    $hardware = 'Oracle ' . $regexp_result[1];
+    $version = $regexp_result[2];
+}