diff --git a/includes/definitions/hpe-ipdu.yaml b/includes/definitions/hpe-ipdu.yaml
new file mode 100644
index 0000000000..66d0e106d7
--- /dev/null
+++ b/includes/definitions/hpe-ipdu.yaml
@@ -0,0 +1,9 @@
+os: hpe-ipdu
+text: 'HPE iPDU'
+type: power
+icon: hpe
+over:
+    - { graph: device_bits, text: Traffic }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.232.165.5
diff --git a/includes/polling/os/hpe-ipdu.inc.php b/includes/polling/os/hpe-ipdu.inc.php
new file mode 100644
index 0000000000..99a8c41199
--- /dev/null
+++ b/includes/polling/os/hpe-ipdu.inc.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * hpe-ipdu.inc.php
+ *
+ * LibreNMS os poller module for HPE iPDU
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2017 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+list(,$version) = explode('firmware version', $poll_device['sysDescr']);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index e823a1521f..52580e5f17 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -821,6 +821,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('hpe-ilo');
     }
 
+    public function testHpeIpdu()
+    {
+        $this->checkOS('hpe-ipdu');
+    }
+
     public function testHpeMsl()
     {
         $this->checkOS('hpe-msl');
diff --git a/tests/snmpsim/hpe-ipdu.snmprec b/tests/snmpsim/hpe-ipdu.snmprec
new file mode 100644
index 0000000000..e8c1a1a146
--- /dev/null
+++ b/tests/snmpsim/hpe-ipdu.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|HP Intelligent Modular PDU , revision W-J, firmware version 2.0.22
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.232.165.5
\ No newline at end of file