Index: includes/discovery/temperatures/apc.inc.php
===================================================================
--- includes/discovery/temperatures/apc.inc.php	(revision 3181)
+++ includes/discovery/temperatures/apc.inc.php	(working copy)
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.2.2.2.0", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
Index: includes/discovery/humidity/apc.inc.php
===================================================================
--- includes/discovery/humidity/apc.inc.php	(revision 3181)
+++ includes/discovery/humidity/apc.inc.php	(working copy)
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   # Environmental monitoring on UPSes etc
   # FIXME emConfigProbesTable may also be used? But not filled out on my device...
Index: includes/discovery/frequencies/apc.inc.php
===================================================================
--- includes/discovery/frequencies/apc.inc.php	(revision 3181)
+++ includes/discovery/frequencies/apc.inc.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 ## APC
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
@@ -68,4 +68,4 @@
   }
 }
 
-?>
\ No newline at end of file
+?>
Index: includes/discovery/voltages/apc.inc.php
===================================================================
--- includes/discovery/voltages/apc.inc.php	(revision 3181)
+++ includes/discovery/voltages/apc.inc.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 ## APC Voltages
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.3.1.3", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
Index: includes/discovery/current/apc.inc.php
===================================================================
--- includes/discovery/current/apc.inc.php	(revision 3181)
+++ includes/discovery/current/apc.inc.php	(working copy)
@@ -1,6 +1,6 @@
 <?php
 
-## APC
+## APC PDUs
 if ($device['os'] == "apc")
 {
   # PDU - Phase
Index: includes/discovery/os/apc.inc.php
===================================================================
--- includes/discovery/os/apc.inc.php	(revision 3181)
+++ includes/discovery/os/apc.inc.php	(working copy)
@@ -2,10 +2,11 @@
 
 if (!$os)
 {
-  if (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
+  if (strstr(snmp_get($device, "SNMPv2-SMI::enterprises.318.1.1.1.1.1.1.0", "-Oqv", ""), "UPS")) { $os = "apcups"; }
+  elseif (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC Metered Rack PDU")) { $os = "apc"; }
 }
 
-?>
\ No newline at end of file
+?>
Index: includes/definitions.inc.php
===================================================================
--- includes/definitions.inc.php	(revision 3181)
+++ includes/definitions.inc.php	(working copy)
@@ -663,7 +663,19 @@
 $config['os'][$os]['type']              = "power";
 $config['os'][$os]['over'][0]['graph']  = "device_current";
 $config['os'][$os]['over'][0]['text']   = "Current";
+$config['os'][$os]['over'][1]['graph']  = "device_voltage";
+$config['os'][$os]['over'][1]['text']   = "Voltage";
 
+$os = "apcups";
+$config['os'][$os]['text']              = "APC UPS";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['group']             = "ups";
+$config['os'][$os]['icon']              = "apc";
+$config['os'][$os]['over'][0]['graph']  = "device_voltage";
+$config['os'][$os]['over'][0]['text']   = "Voltage";
+$config['os'][$os]['over'][1]['graph']  = "device_frequency";
+$config['os'][$os]['over'][1]['text']   = "Frequencies";
+
 $os = "netbotz";
 $config['os'][$os]['text']              = "Netbotz Environment sensor";
 $config['os'][$os]['type']              = "environment";