diff --git a/includes/discovery/os/engenius.inc.php b/includes/discovery/os/engenius.inc.php
index d19a0be784..ca7ac6a716 100644
--- a/includes/discovery/os/engenius.inc.php
+++ b/includes/discovery/os/engenius.inc.php
@@ -4,6 +4,13 @@ if (!$os)
 {
   if (strstr($sysObjectId, ".1.3.6.1.4.1.14125.100.1.3")) { $os = "engenius"; }
   else if (strstr($sysObjectId, ".1.3.6.1.4.1.14125.101.1.3")) { $os = "engenius"; }
+  else if ($sysDescr == "Wireless Access Point")
+  {
+    if (!empty(snmp_get($device, "SNMPv2-SMI::enterprises.14125.2.1.1.6.0", "-Oqv", "")))
+    {
+      $os = "engenius";
+    }
+  }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/polling/os/engenius.inc.php b/includes/polling/os/engenius.inc.php
index a0fa3b4e95..8fa138ce15 100644
--- a/includes/polling/os/engenius.inc.php
+++ b/includes/polling/os/engenius.inc.php
@@ -1,17 +1,30 @@
 <?php
 
 # Sorry about the OIDs but there doesn't seem to be a matching MIB available... :-/
-
+if(!empty(snmp_get($device, "1.3.6.1.4.1.14125.100.1.8.0", "-OQv")))
+{
 $version = "Kernel " . trim(snmp_get($device, "1.3.6.1.4.1.14125.100.1.8.0", "-OQv"),'" ');
 $version .= " / Apps " . trim(snmp_get($device, "1.3.6.1.4.1.14125.100.1.9.0", "-OQv"),'" ');
-
+}
+else
+{
+$version = "Firmware " . trim(snmp_get($device, "1.3.6.1.4.1.14125.2.1.1.5.0", "-OQv"),'" ');
+}
 $serial = trim(snmp_get($device, "1.3.6.1.4.1.14125.100.1.7.0", "-OQv"),'" ');
 
 # There doesn't seem to be a real hardware identification.. sysName will have to do?
+if(!empty(snmp_get($device, "1.3.6.1.4.1.14125.100.1.6.0", "-OQv")))
+{
 $hardware = str_replace("EnGenius ","",snmp_get($device,"sysName.0", "-OQv")) . " v" . trim(snmp_get($device, "1.3.6.1.4.1.14125.100.1.6.0", "-OQv"),'" .');
+}
+else
+{
+$hardware = snmp_get($device,"sysName.0", "-OQv") . trim(snmp_get($device, "1.3.6.1.4.1.14125.3.1.1.5.0", "-OQv"),'" .');
+}
 
 $mode = snmp_get($device, "1.3.6.1.4.1.14125.100.1.4.0", "-OQv");
-
+if(is_numeric($mode))
+{
 switch ($mode)
 {
   case 0:
@@ -33,5 +46,5 @@ switch ($mode)
     $features = "WDS Bridge mode";
     break;
 }
-
-?>
\ No newline at end of file
+}
+?>