diff --git a/html/includes/graphs/device/ubnt_airfiber_RxPower.inc.php b/html/includes/graphs/device/ubnt_airfiber_RxPower.inc.php
new file mode 100644
index 0000000000..6a80c781a9
--- /dev/null
+++ b/html/includes/graphs/device/ubnt_airfiber_RxPower.inc.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'includes/graphs/common.inc.php';
+
+$rrd_options .= ' -l 0 -E ';
+
+$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfibre-mib-rx');
+
+if (rrdtool_check_rrd_exists($rrdfilename)) {
+    $rrd_options .= " COMMENT:'dbm                        Now    Min     Max\\n'";
+    $rrd_options .= ' DEF:rxPower0='.$rrdfilename.':rxPower0:AVERAGE ';
+    $rrd_options .= ' DEF:rxPower1='.$rrdfilename.':rxPower1:AVERAGE ';
+    $rrd_options .= " LINE1:rxPower0#00FF00:'Rx Chain0 Power             ' ";
+    $rrd_options .= ' GPRINT:rxPower0:LAST:%3.2lf ';
+    $rrd_options .= ' GPRINT:rxPower0:MIN:%3.2lf ';
+    $rrd_options .= ' GPRINT:rxPower0:MAX:%3.2lf\\\l ';
+    $rrd_options .= " LINE1:rxPower1#CC0000:'Rx Chain1 Power             ' ";
+    $rrd_options .= ' GPRINT:rxPower1:LAST:%3.2lf ';
+    $rrd_options .= ' GPRINT:rxPower1:MIN:%3.2lf ';
+    $rrd_options .= ' GPRINT:rxPower1:MAX:%3.2lf\\\l ';
+}
diff --git a/includes/definitions/airos-af.yaml b/includes/definitions/airos-af.yaml
index 3719ac9a6e..096eefa8d0 100644
--- a/includes/definitions/airos-af.yaml
+++ b/includes/definitions/airos-af.yaml
@@ -1,6 +1,6 @@
 os: airos-af
 text: 'Ubiquiti AirFiber'
-type: network
+type: wireless
 icon: ubiquiti
 nobulk: 1
 group: ubnt
diff --git a/includes/polling/mib/ubnt-airfiber-mib.inc.php b/includes/polling/mib/ubnt-airfiber-mib.inc.php
index 01c353925b..e650bcda58 100644
--- a/includes/polling/mib/ubnt-airfiber-mib.inc.php
+++ b/includes/polling/mib/ubnt-airfiber-mib.inc.php
@@ -209,4 +209,31 @@ unset($graph, $oids, $oid);
 
 poll_mib_def($device, 'UBNT-AirFIBER-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs);
 
+
+echo ' UBNT-AirFIBER-MIB Rx levels ';
+
+// $mib_oids                                (oidindex,dsname,dsdescription,dstype)
+$mib_oids = array(
+    'rxPower0'                 => array(
+            '1',
+            'rxPower0',
+            'Rx Chain0 Power',
+            'GAUGE',
+    ),
+    'rxPower1'                 => array(
+            '1',
+            'rxPower1',
+            'Rx Chain1 Power',
+            'GAUGE',
+    ),
+);
+
+$mib_graphs = array(
+    'ubnt_airfiber_RxPower',
+);
+
+unset($graph, $oids, $oid);
+
+poll_mib_def($device, 'UBNT-AirFIBER-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs, 'ubnt-airfibre-mib-rx');
+
 // EOF