diff --git a/doc/Support/Features.md b/doc/Support/Features.md
index 77f67704fe..964dbe10bd 100644
--- a/doc/Support/Features.md
+++ b/doc/Support/Features.md
@@ -90,6 +90,7 @@ If you are unsure of whether your device is supported or not, feel free to ask u
 * Liebert
 * LigoWave
 * Linux
+* Maipu
 * Mellanox
 * Meraki
 * MGE
diff --git a/html/images/os/maipu.png b/html/images/os/maipu.png
new file mode 100644
index 0000000000..ceb9ddf3df
Binary files /dev/null and b/html/images/os/maipu.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index a24a2d10a6..cb3a79e32f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -140,6 +140,18 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'mypoweros';
+$config['os'][$os]['text']             = 'Maipu MyPower';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'maipu';
+$config['os'][$os]['ifname']           = 1;
+$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']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Time server
 $os = 'microsemitime';
 $config['os'][$os]['text']             = 'Microsemi Timing';
diff --git a/includes/discovery/os/maipu.inc.php b/includes/discovery/os/maipu.inc.php
new file mode 100644
index 0000000000..b45a479a0c
--- /dev/null
+++ b/includes/discovery/os/maipu.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 (!$os) {
+    if (strpos($sysObjectId, '.1.3.6.1.4.1.5651.1.102.21') !== false) {
+        $os = 'mypoweros';
+    }
+}
diff --git a/includes/polling/os/mypoweros.inc.php b/includes/polling/os/mypoweros.inc.php
new file mode 100644
index 0000000000..90a58a5aa0
--- /dev/null
+++ b/includes/polling/os/mypoweros.inc.php
@@ -0,0 +1,15 @@
+<?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.
+ */
+
+$data = explode(" ",$poll_device['sysDescr']);
+$hardware = $data['6'];
+$version = str_replace("", ",", $data['8']);