diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 7c6847c5e4072a85a72fd81f7b1bc69717225864..9ccf32f592f2418146cb07560b75254118794338 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -149,6 +149,10 @@ ath79-generic
 
 * Ubiquiti
 
+  - NanoBeam 5AC 19 (XC)
+  - NanoBeam M5 (XW)
+  - NanoStation Loco M2/M5 (XW)
+  - NanoStation M2/M5 (XW)
   - UniFi AC Lite
   - UniFi AC LR
   - UniFi AC Mesh
diff --git a/targets/ath79-generic b/targets/ath79-generic
index b9b80388ac391abfbfa21557eb7f79ff5cfd8419..c19982dab448956d91db3dcd6402f060d101b551 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -530,6 +530,21 @@ device('tp-link-wbs510-v1', 'tplink_wbs510-v1')
 
 -- Ubiquiti
 
+device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
+	manifest_aliases = {
+		'ubiquiti-loco-m-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-loco-m2-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-loco-m5-xw', -- upgrade from OpenWrt 19.07
+	},
+})
+
+device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw', {
+	manifest_aliases = {
+		'ubiquiti-nanostation-m2-xw', -- upgrade from OpenWrt 19.07
+		'ubiquiti-nanostation-m5-xw', -- upgrade from OpenWrt 19.07
+	},
+})
+
 device('ubiquiti-unifi-ac-lite', 'ubnt_unifiac-lite', {
 	factory = false,
 	packages = ATH10K_PACKAGES_QCA9880,
@@ -566,6 +581,18 @@ device('ubiquiti-unifi-ap', 'ubnt_unifi-ap', {
 
 device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus')
 
+device('ubiquiti-nanobeam-ac-gen1-xc', 'ubnt_nanobeam-ac-xc', {
+	packages = ATH10K_PACKAGES_QCA9880,
+})
+
+device('ubiquiti-nanobeam-m5-xw', 'ubnt_nanobeam-m5-xw')
+
+device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus', {
+	manifest_aliases = {
+		'ubiquiti-unifiap-outdoor+', -- upgrade from OpenWrt 19.07
+	},
+})
+
 device('ubiquiti-unifi-ap-pro', 'ubnt_unifi-ap-pro')
 
 device('ubiquiti-unifi-swiss-army-knife-ultra', 'ubnt_uk-ultra', {