diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index d6ca03c1..11550b2d 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -77,6 +77,11 @@ ath79-generic
   - TL-WDR4300 (v1)
   - WBS210 (v2.0)
 
+* Ubiquiti
+
+  - UniFi AP
+  - UniFi AP LR
+
 ath79-nand
 ----------
 
diff --git a/modules b/modules
index b2c60ea8..da06aa08 100644
--- a/modules
+++ b/modules
@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-21.02
-OPENWRT_COMMIT=180b750c02dd9dd066cf67ee7c3480eb0ec36b70
+OPENWRT_COMMIT=f65edc9b990c2bcc10c9e9fca29253adc6fe316d
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-21.02
-PACKAGES_PACKAGES_COMMIT=762794d143b6734b706d07944598c04074685f99
+PACKAGES_PACKAGES_COMMIT=08a442fe9f7bc2bf1a967d702514c0e136ecde08
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-21.02
-PACKAGES_ROUTING_COMMIT=5971f1937c76c771081f2b83de8e7263a28837b2
+PACKAGES_ROUTING_COMMIT=fc0b140689271efcd913059826b6f9567da2a3e0
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=308166e3c6b2d571606dd1dbfadd2bb8e31d8f90
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 03e0d741..7a2075b9 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -279,3 +279,14 @@ device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
 device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
 
 device('tp-link-wbs210-v2', 'tplink_wbs210-v2')
+
+-- Ubiquiti
+
+device('ubiquiti-unifi-ap', 'ubnt_unifi', {
+	aliases = {
+		'ubiquiti-unifi-ap-lr',
+	},
+	manifest_aliases = {
+		'ubiquiti-unifi',
+	},
+})