diff --git a/html/images/os/lenovo.png b/html/images/os/lenovo.png
new file mode 100644
index 000000000..f1812ce0d
Binary files /dev/null and b/html/images/os/lenovo.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 26f58e992..8d747e1f3 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1440,6 +1440,19 @@ $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';
+$config['os'][$os]['group'] = 'storage';
+$config['os'][$os]['text'] = 'LenovoEMC';
+$config['os'][$os]['icon'] = 'lenovo';
+$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/lenovoemc.inc.php b/includes/discovery/os/lenovoemc.inc.php
new file mode 100644
index 000000000..a25843b54
--- /dev/null
+++ b/includes/discovery/os/lenovoemc.inc.php
@@ -0,0 +1,15 @@
+ "IOMEGANAS-MIB",
+ "tempValue" => "IOMEGANAS-MIB",
+ "raidStatus" => "IOMEGANAS-MIB",
+ "diskStatus" => "IOMEGANAS-MIB"
+ );
+ register_mibs($device, $lenovoemc_mibs, "includes/discovery/os/lenovoemc.inc.php");
+ }
+}
diff --git a/includes/polling/os/lenovoemc.inc.php b/includes/polling/os/lenovoemc.inc.php
new file mode 100644
index 000000000..aab013b3e
--- /dev/null
+++ b/includes/polling/os/lenovoemc.inc.php
@@ -0,0 +1,2 @@
+