diff --git a/html/images/logos/digipower.png b/html/images/logos/digipower.png
new file mode 100644
index 000000000000..fbab5ea07124
Binary files /dev/null and b/html/images/logos/digipower.png differ
diff --git a/html/images/os/digipower.png b/html/images/os/digipower.png
new file mode 100644
index 000000000000..7f1a23f7478b
Binary files /dev/null and b/html/images/os/digipower.png differ
diff --git a/includes/definitions/digipower.yaml b/includes/definitions/digipower.yaml
new file mode 100644
index 000000000000..399d5e159012
--- /dev/null
+++ b/includes/definitions/digipower.yaml
@@ -0,0 +1,7 @@
+os: digipower
+text: 'Digipower'
+type: power
+over:
+    - { graph: device_current, text: Current }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.17420
diff --git a/includes/discovery/sensors/current/digipower.inc.php b/includes/discovery/sensors/current/digipower.inc.php
new file mode 100644
index 000000000000..5faccfbabef4
--- /dev/null
+++ b/includes/discovery/sensors/current/digipower.inc.php
@@ -0,0 +1,15 @@
+<?php
+
+// input current
+$oids = snmp_get($device, '.1.3.6.1.4.1.17420.1.2.9.1.11.0', '-OsqnU');
+d_echo($oids."\n");
+
+if ($oids) {
+    echo ' Cyberpower Input Current';
+    list($oid, $current) = explode(' ', $oids);
+    $divisor            = 10;
+    $type               = 'digipower';
+    $descr              = 'Input';
+    $current=$current/10;
+    discover_sensor($valid['sensor'], 'current', $device, $oid, '0', $type, $descr, $divisor, '1', null, null, null, null, $current);
+}
diff --git a/includes/polling/os/digipower.inc.php b/includes/polling/os/digipower.inc.php
new file mode 100644
index 000000000000..152d50d8cc42
--- /dev/null
+++ b/includes/polling/os/digipower.inc.php
@@ -0,0 +1,12 @@
+<?php
+
+$oids=array(
+    '.1.3.6.1.4.1.17420.1.2.9.1.19.0',
+    '.1.3.6.1.4.1.17420.1.2.4.0'
+);
+$returned_oids=snmp_get_multi_oid($device, $oids);
+
+$hardware = $returned_oids['.1.3.6.1.4.1.17420.1.2.9.1.19.0'];
+$hardware = str_replace('"', '', $hardware);
+$version = $returned_oids['.1.3.6.1.4.1.17420.1.2.4.0'];
+$version = str_replace('"', '', $version);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index a179fe614475..7aab2b371faa 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1759,4 +1759,9 @@ public function testZyxelnwa()
         $this->checkOS('zyxelnwa');
         $this->checkOS('zyxelnwa', 'zyxelnwa1');
     }
+    
+    public function testDigipower()
+    {
+        $this->checkOS('digipower');
+    }
 }
diff --git a/tests/snmpsim/digipower.snmprec b/tests/snmpsim/digipower.snmprec
new file mode 100644
index 000000000000..873afbd6e853
--- /dev/null
+++ b/tests/snmpsim/digipower.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Switched PDU
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.17420