diff --git a/includes/discovery/current/xups.inc.php b/includes/discovery/current/xups.inc.php
index 504860ba8..7d44c22cd 100644
--- a/includes/discovery/current/xups.inc.php
+++ b/includes/discovery/current/xups.inc.php
@@ -28,7 +28,7 @@ if ($device['os'] == "powerware")
     }
   }
 
-  $oids = trim(snmp_walk($device, "xupsOutputCurrent", "-OsqnU"));
+  $oids = trim(snmp_walk($device, "xupsOutputCurrent", "-OsqnU", "XUPS-MIB"));
   if ($debug) { echo($oids."\n"); }
   list($unused,$numPhase) = explode(' ',$oids);
   for($i = 1; $i <= $numPhase;$i++)
@@ -42,7 +42,7 @@ if ($device['os'] == "powerware")
     echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
-  $oids = trim(snmp_walk($device, "xupsInputCurrent", "-OsqnU"));
+  $oids = trim(snmp_walk($device, "xupsInputCurrent", "-OsqnU", "XUPS-MIB"));
   if ($debug) { echo($oids."\n"); }
   list($unused,$numPhase) = explode(' ',$oids);
   for($i = 1; $i <= $numPhase;$i++)
diff --git a/includes/polling/ups.inc.php b/includes/polling/ups.inc.php
index 58f2c4a96..2ebe8cbc6 100644
--- a/includes/polling/ups.inc.php
+++ b/includes/polling/ups.inc.php
@@ -11,6 +11,9 @@
 # XUPS-MIB::xupsTestBattery.0 = INTEGER: 0
 # XUPS-MIB::xupsTestBatteryStatus.0 = INTEGER: unknown(1)
 # XUPS-MIB::xupsOutputLoad.0 = INTEGER: 19
+# XUPS-MIB::xupsOnBattery
+# XUPS-MIB::xupsLowBattery
+# Powerware also supports a small part of the IETF UPS-MIB (RFC1628)
 
 # gamatronic: unknown