diff --git a/html/images/os/ubiquiti.png b/html/images/os/ubiquiti.png
new file mode 100644
index 0000000000..f079540830
Binary files /dev/null and b/html/images/os/ubiquiti.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index bb202a28ea..6f2549178a 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -580,6 +580,11 @@ $config['os'][$os]['text']              = "D-Link Access Point";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['icon']              = "dlink";
 
+$os = "ubiquitiap";
+$config['os'][$os]['text']              = "Ubiquiti Networks Wireless";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "ubiquiti";
+
 $os = "axiscam";
 $config['os'][$os]['text']              = "AXIS Network Camera";
 $config['os'][$os]['icon']              = "axis";
diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
new file mode 100644
index 0000000000..243fec9756
--- /dev/null
+++ b/includes/discovery/os/ubiquitiap.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") ) {
+        $os = "ubiquitiap";
+    }
+}
+
+?>
diff --git a/includes/polling/os/ubiquitiap.inc.php b/includes/polling/os/ubiquitiap.inc.php
new file mode 100644
index 0000000000..63884caeb4
--- /dev/null
+++ b/includes/polling/os/ubiquitiap.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-Oqv", "IEEE802dot11-MIB");
+$hardware = $data[0];
+
+if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $data[1],$matches)) {
+    $version = $matches[0];
+}
+
+?>