diff --git a/SUPPORTED_DEVICES.md b/SUPPORTED_DEVICES.md
index 03fdfece..99bfc9d0 100644
--- a/SUPPORTED_DEVICES.md
+++ b/SUPPORTED_DEVICES.md
@@ -84,12 +84,12 @@ Rocket M5 XM || 5 | ath79 | generic | ubnt_rocket-m | 64MB | stable | released
 Rocket M5GPS XM || 5 | ath79 | generic | ubnt_rocket-m | 64MB | stable | released
 Rocket M2 XM with USB port || 2 | ath79 | generic | ubnt_rocket-m | 64MB | unknown | released
 Rocket M5 XM with USB port || 5 | ath79 | generic | ubnt_rocket-m | 64MB | unknown | released
-Rocket M2 XW || 2 | ath79 | generic | ubnt_rocket-m-xw | 64MB | unknown | released
-Rocket M5 XW || 5 | ath79 | generic | ubnt_rocket-m-xw | 64MB | stable | released
+Rocket M2 XW || 2 | ath79 | generic | ubnt_rocket-m2-xw | 64MB | stable | nightly
+Rocket M5 XW || 5 | ath79 | generic | ubnt_rocket-m5-xw | 64MB | stable | nightly
 Rocket M2 Titanium TI || 2 | ath79 | - | - | 64MB | unknown | released
-Rocket M2 Titanium XW || 2 | ath79 | generic | ubnt_rocket-m-xw | 64MB | unknown | released
+Rocket M2 Titanium XW || 2 | ath79 | generic | ubnt_rocket-m2-xw | 64MB | unknown | released
 Rocket M5 Titanium TI || 5 | ath79 | - | - | 64MB | unknown | released
-Rocket M5 Titanium XW || 5 | ath79 | generic | ubnt_rocket-m-xw | 64MB | stable | released
+Rocket M5 Titanium XW || 5 | ath79 | generic | ubnt_rocket-m5-xw | 64MB | stable | released
 
 
 ## TP-Link
diff --git a/configs/ath79-generic.config b/configs/ath79-generic.config
index 998ec483..65a6c456 100644
--- a/configs/ath79-generic.config
+++ b/configs/ath79-generic.config
@@ -44,4 +44,5 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-5ac-gen2=y
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbridge-m=y
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-5ac-lite=y
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-m=y
-CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-m-xw=y
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-m2-xw=y
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-m5-xw=y
diff --git a/patches/746-rocket-m-xw-support.patch b/patches/746-rocket-m-xw-support.patch
index 2cc836da..33cf33c2 100644
--- a/patches/746-rocket-m-xw-support.patch
+++ b/patches/746-rocket-m-xw-support.patch
@@ -1,31 +1,39 @@
 --- a/target/linux/ath79/image/generic-ubnt.mk
 +++ b/target/linux/ath79/image/generic-ubnt.mk
-@@ -157,6 +157,14 @@
+@@ -157,6 +157,22 @@
  endef
  TARGET_DEVICES += ubnt_powerbeam-m5-xw
  
-+define Device/ubnt_rocket-m-xw
++define Device/ubnt_rocket-m5-xw
 +  $(Device/ubnt-xw)
 +  DEVICE_MODEL := Rocket M XW
 +  DEVICE_PACKAGES += rssileds
-+  SUPPORTED_DEVICES += rocket-m-xw loco-m-xw
++  SUPPORTED_DEVICES += rocket-m-xw rocket-m5-xw loco-m-xw
 +endef
-+TARGET_DEVICES += ubnt_rocket-m-xw
++TARGET_DEVICES += ubnt_rocket-m5-xw
++
++define Device/ubnt_rocket-m2-xw
++  $(Device/ubnt-xw)
++  DEVICE_MODEL := Rocket M2 XW
++  DEVICE_PACKAGES += rssileds
++  SUPPORTED_DEVICES += rocket-m-xw rocket-m2-xw loco-m-xw
++endef
++TARGET_DEVICES += ubnt_rocket-m2-xw
 +
  define Device/ubnt_rocket-5ac-lite
    $(Device/ubnt-xc)
    SOC := qca9558
 
 --- /dev/null
-+++ b/target/linux/ath79/dts/ar9342_ubnt_rocket-m-xw.dts
++++ b/target/linux/ath79/dts/ar9342_ubnt_rocket-m5-xw.dts
 @@ -0,0 +1,34 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 +
 +#include "ar9342_ubnt_xw.dtsi"
 +
 +/ {
-+	compatible = "ubnt,rocket-m-xw", "ubnt,xw", "qca,ar9342";
-+	model = "Ubiquiti Rocket M (XW)";
++	compatible = "ubnt,rocket-m5-xw", "ubnt,xw", "qca,ar9342";
++	model = "Ubiquiti Rocket M5 (XW)";
 +};
 +
 +&mdio0 {
@@ -53,3 +61,32 @@
 +		rxdv-delay = <3>;
 +	};
 +};
+--- /dev/null
++++ b/target/linux/ath79/dts/ar9342_ubnt_rocket-m2-xw.dts
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "ar9342_ubnt_xw.dtsi"
++
++/ {
++	compatible = "ubnt,rocket-m2-xw", "ubnt,xw", "qca,ar9342";
++	model = "Ubiquiti Rocket M2 (XW)";
++};
++
++&mdio0 {
++	status = "okay";
++
++	phy-mask = <0x1>;
++
++	phy1: ethernet-phy@1 {
++		reg = <1>;
++		phy-mode = "mii";
++		reset-gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
++	};
++};
++
++&eth0 {
++	status = "okay";
++
++	phy-handle = <&phy1>;
++};
diff --git a/patches/748-powerbeam-m5-300-support.patch b/patches/748-powerbeam-m5-300-support.patch
index fa4c4872..1c098484 100644
--- a/patches/748-powerbeam-m5-300-support.patch
+++ b/patches/748-powerbeam-m5-300-support.patch
@@ -41,6 +41,6 @@
 +endef
 +TARGET_DEVICES += ubnt_powerbeam-m5-300
 +
- define Device/ubnt_rocket-m-xw
+ define Device/ubnt_rocket-m5-xw
    $(Device/ubnt-xw)
-   DEVICE_MODEL := Rocket M XW
+   DEVICE_MODEL := Rocket M5 XW