diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index ba46626ee3..abeceee2e6 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -574,6 +574,7 @@ $config['modules_compat']['rfc1628']['netmanplus']        = 1;
 $config['modules_compat']['rfc1628']['deltaups']          = 1;
 $config['modules_compat']['rfc1628']['poweralert']        = 1;
 $config['modules_compat']['rfc1628']['multimatic']        = 1;
+$config['modules_compat']['rfc1628']['webpower']          = 1;
 
 # Enable daily updates
 $config['update'] = 1;
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 1fb938f362..52d24bbc1e 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -850,6 +850,12 @@ $config['os'][$os]['type']              = "power";
 $config['os'][$os]['over'][0]['graph']  = "device_current";
 $config['os'][$os]['over'][0]['text']   = "Current";
 
+$os = "webpower";
+$config['os'][$os]['text']              = "WebPower";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['over'][0]['graph']  = "device_current";
+$config['os'][$os]['over'][0]['text']   = "Current";
+
 $os = "netbotz";
 $config['os'][$os]['text']              = "Netbotz Environment sensor";
 $config['os'][$os]['type']              = "environment";
diff --git a/includes/discovery/os/webpower.inc.php b/includes/discovery/os/webpower.inc.php
new file mode 100644
index 0000000000..1053667f56
--- /dev/null
+++ b/includes/discovery/os/webpower.inc.php
@@ -0,0 +1,5 @@
+<?php
+if (!$os) {
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.2468.1.2.1")) { $os = "webpower"; }
+}
+?>
diff --git a/includes/polling/os/webpower.inc.php b/includes/polling/os/webpower.inc.php
new file mode 100644
index 0000000000..ff368d76a2
--- /dev/null
+++ b/includes/polling/os/webpower.inc.php
@@ -0,0 +1,19 @@
+<?php
+/*
+* LibreNMS WebPower OS information module
+*
+* Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
+* 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 = str_replace('"', '', snmp_get($device, "1.3.6.1.2.1.33.1.1.4.0", "-Ovq"));
+preg_match_all('/^WebPower Pro II Card|v[0-9]+.[0-9]+|(SN [0-9]+)/', $data, $matches);
+$hardware = $matches[0][0];
+$version = $matches[0][1];
+$serial = $matches[0][2];
+
+?>