diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 2c6ebe10f1..0f4d1316c0 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1672,8 +1672,8 @@ $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 
 // Xirrus AP
-$os = 'xirrus';
-$config['os'][$os]['text']             = 'Xirrus';
+$os = 'xirrus_aos';
+$config['os'][$os]['text']             = 'Xirrus ArrayOS';
 $config['os'][$os]['type']             = 'wireless';
 $config['os'][$os]['icon']             = 'xirrus';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
diff --git a/includes/discovery/os/xirrus.inc.php b/includes/discovery/os/xirrus.inc.php
index 9540aa22fa..a33e76d3b6 100644
--- a/includes/discovery/os/xirrus.inc.php
+++ b/includes/discovery/os/xirrus.inc.php
@@ -2,7 +2,9 @@
 
 if(!$os) {
     if (strstr($sysDescr, 'Xirrus')) {
-        $os = 'xirrus';
+	if (strstr($sysDescr, 'ArrayOS')) {
+	        $os = 'xirrus_aos';
+	}
     }
 }