diff --git a/sys/modules/dtb/rpi/Makefile b/sys/modules/dtb/rpi/Makefile
index 482f8d5f30a6..cdc6c86777d3 100644
--- a/sys/modules/dtb/rpi/Makefile
+++ b/sys/modules/dtb/rpi/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
-# DTS files for the Raspberry Pi-B
-.if ${MACHINE_ARCH:Marmv[67]*} != ""
+# DTS files for the 32-bit and 64-bit arm-based Raspberry Pi family of devices
+.if ${MACHINE_CPUARCH} == "arm"
 DTSO=	\
 	spigen-rpi-b.dtso \
 	spigen-rpi2.dtso
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif ${MACHINE_CPUARCH} == "aarch64"
 DTSO=	\
 	spigen-rpi3.dtso \
 	spigen-rpi4.dtso
 .endif
 
 .include <bsd.dtb.mk>