diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 5343a73a84..fcb55bc35f 100755
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -20,6 +20,9 @@ if (!$os)
       $os = "airos";
       if (strpos(trim(snmp_get($device, "dot11manufacturerProductName.5", "-Osqnv", "IEEE802dot11-MIB")), "UAP") !== FALSE) { $os = "unifi"; }
       elseif (strpos(trim(snmp_get($device, "dot11manufacturerProductName.2", "-Osqnv", "IEEE802dot11-MIB")), "UAP") !== FALSE) { $os = "unifi"; }
+      elseif (strpos(trim(snmp_get($device, "dot11manufacturerProductName.3", "-Osqnv", "IEEE802dot11-MIB")), "UAP") !== FALSE) { $os = "unifi"; }
+      elseif (strpos(trim(snmp_get($device, "dot11manufacturerProductName.4", "-Osqnv", "IEEE802dot11-MIB")), "UAP") !== FALSE) { $os = "unifi"; }
+      elseif (strpos(trim(snmp_get($device, "dot11manufacturerProductName.6", "-Osqnv", "IEEE802dot11-MIB")), "UAP") !== FALSE) { $os = "unifi"; }
       elseif (trim(snmp_get($device, "fwVersion.1", "-Osqnv", "UBNT-AirFIBER-MIB")) != '') { $os = "airos-af"; }
     }
     else
diff --git a/includes/polling/os/unifi.inc.php b/includes/polling/os/unifi.inc.php
new file mode 100644
index 0000000000..c943b4ec5b
--- /dev/null
+++ b/includes/polling/os/unifi.inc.php
@@ -0,0 +1,24 @@
+<?php
+$data = snmp_get_multi($device, "dot11manufacturerProductName.2 dot11manufacturerProductVersion.2", "-OQUs", "IEEE802dot11-MIB");
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.3 dot11manufacturerProductVersion.3", "-OQUs", "IEEE802dot11-MIB");
+}
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.4 dot11manufacturerProductVersion.4", "-OQUs", "IEEE802dot11-MIB");
+}
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-OQUs", "IEEE802dot11-MIB");
+}
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.6 dot11manufacturerProductVersion.6", "-OQUs", "IEEE802dot11-MIB");
+}
+
+foreach ($data as $line) {
+    if (!empty($line['dot11manufacturerProductName'])) {
+        $hardware = $line['dot11manufacturerProductName'];
+    }
+    if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $line['dot11manufacturerProductVersion'],$matches)) {
+        $version = $matches[0];
+    }
+}
+