diff --git a/config/targets.conf b/config/targets.conf
index ee88910194..7fff48c180 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -535,6 +535,12 @@ pineh64				current			buster		cli			stable	yes
 pineh64				current			bullseye	cli			stable	yes
 pineh64				current			buster		desktop			stable	yes
 
+# Pine H64 B
+
+pineh64-b			current			buster		cli			stable	yes
+pineh64-b			current			bullseye	cli			stable	yes
+pineh64-b			current			buster		desktop			stable	yes
+
 # Renegade
 
 renegade			legacy			buster		cli			stable	yes
@@ -576,10 +582,9 @@ rockpi-s			legacy			bullseye	minimal			beta	yes
 # Rock64pro
 
 rockpro64			legacy			buster		cli			stable	yes
-rockpro64			current			buster		cli			stable	yes
 rockpro64			legacy			bionic		desktop			stable	yes
 rockpro64			current			buster		desktop			stable	yes
-rockpro64			dev			buster		minimal			beta	yes
+rockpro64			current			bionic		cli			stable	yes
 
 # Teres A64
 
diff --git a/patch/u-boot/u-boot-sunxi/add-pineh64-model-b.patch b/patch/u-boot/u-boot-sun50iw6/add-pineh64-model-b.patch
similarity index 67%
rename from patch/u-boot/u-boot-sunxi/add-pineh64-model-b.patch
rename to patch/u-boot/u-boot-sun50iw6/add-pineh64-model-b.patch
index 215458c9b4..cf624590b7 100644
--- a/patch/u-boot/u-boot-sunxi/add-pineh64-model-b.patch
+++ b/patch/u-boot/u-boot-sun50iw6/add-pineh64-model-b.patch
@@ -30,3 +30,17 @@ index 00000000..ace3e84e
 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64-model-b"
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_OHCI_HCD=y
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 7a791cba..e74adc94 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -525,7 +525,8 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
+ 	sun50i-h6-orangepi-lite2.dtb \
+ 	sun50i-h6-orangepi-one-plus.dtb \
+ 	sun50i-h6-orangepi-lite2.dtb \
+-	sun50i-h6-pine-h64.dtb
++	sun50i-h6-pine-h64.dtb \
++	sun50i-h6-pine-h64-model-b.dtb
+ dtb-$(CONFIG_MACH_SUN50I) += \
+ 	sun50i-a64-amarula-relic.dtb \
+ 	sun50i-a64-bananapi-m64.dtb \