diff --git a/includes/polling/os/apc.inc.php b/includes/polling/os/apc.inc.php
index 9bb1bdf4b8..619bc8e522 100755
--- a/includes/polling/os/apc.inc.php
+++ b/includes/polling/os/apc.inc.php
@@ -50,19 +50,29 @@ if ($hardware == " ")
 
 ######################
 
-# PDU
-$version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.3.0", "-OQv", "", ""),'"');
+$AOSrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.1", "-OQv", "", ""),'"'); 
+$APPrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.2", "-OQv", "", ""),'"');
 
-if ($version == "")
+if ($AOSrev == '')
 {
-  # ATS
-  $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.2.0", "-OQv", "", ""),'"');
+  # PDU
+  $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.3.0", "-OQv", "", ""),'"');
+  
+  if ($version == "")
+  {
+    # ATS
+    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.2.0", "-OQv", "", ""),'"');
+  }
+  
+  if ($version == "")
+  {
+    # Masterswitch/AP9606
+    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.2.0", "-OQv", "", ""),'"');
+  }
 }
-
-if ($version == "")
+else
 {
-  # Masterswitch/AP9606
-  $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.2.0", "-OQv", "", ""),'"');
+  $version = "AOS $AOSrev / App $APPrev";
 }
 
 ?>