diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index abeceee2e6..8586266eed 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -575,6 +575,7 @@ $config['modules_compat']['rfc1628']['deltaups']          = 1;
 $config['modules_compat']['rfc1628']['poweralert']        = 1;
 $config['modules_compat']['rfc1628']['multimatic']        = 1;
 $config['modules_compat']['rfc1628']['webpower']          = 1;
+$config['modules_compat']['rfc1628']['huaweiups']         = 1;
 
 # Enable daily updates
 $config['update'] = 1;
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 52d24bbc1e..3c551d5712 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1162,6 +1162,15 @@ $config['os'][$os]['text']              = "Multimatic UPS";
 $config['os'][$os]['type']              = "power";
 $config['os'][$os]['icon']              = "multimatic";
 
+// Huawei UPS
+$os = "huaweiups";
+$config['os'][$os]['text']              = "Huawei UPS";
+$config['os'][$os]['group']             = "ups";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['icon']              = "huawei";
+$config['os'][$os]['over'][0]['graph']  = "device_current";
+$config['os'][$os]['over'][0]['text']   = "Current";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/huaweiups.inc.php b/includes/discovery/os/huaweiups.inc.php
new file mode 100644
index 0000000000..6b7f4f38d1
--- /dev/null
+++ b/includes/discovery/os/huaweiups.inc.php
@@ -0,0 +1,12 @@
+<?php
+
+if (!$os)
+{
+    if (preg_match("/^Linux GSE200M/", $sysDescr)) {
+	    if (strstr(snmp_get($device, "UPS-MIB::upsIdentManufacturer.0", "-Oqv", ""), "HUAWEI")){ 
+		    $os = "huaweiups";
+	    }
+    }
+}
+
+?>