diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -69,6 +69,12 @@
 	audit.4 \
 	auditpipe.4 \
 	aue.4 \
+	${_aw_gpio.4} \
+	${_aw_mmc.4} \
+	${_aw_rtc.4} \
+	${_aw_sid.4} \
+	${_aw_spi.4} \
+	${_aw_syscon.4} \
 	axe.4 \
 	axge.4 \
 	axp.4 \
@@ -961,6 +967,12 @@
 
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \
 	 ${MACHINE_CPUARCH} == "riscv"
+_aw_gpio.4=	aw_gpio.4
+_aw_mmc.4=	aw_mmc.4
+_aw_rtc.4=	aw_rtc.4
+_aw_sid.4=	aw_sid.4
+_aw_spi.4=	aw_spi.4
+_aw_syscon.4=	aw_syscon.4
 _cgem.4=	cgem.4
 MLINKS+=cgem.4 if_cgem.4
 .endif
diff --git a/share/man/man4/man4.arm/aw_gpio.4 b/share/man/man4/aw_gpio.4
rename from share/man/man4/man4.arm/aw_gpio.4
rename to share/man/man4/aw_gpio.4
--- a/share/man/man4/man4.arm/aw_gpio.4
+++ b/share/man/man4/aw_gpio.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd October 8, 2024
-.Dt AW_GPIO 4 arm
+.Dt AW_GPIO 4
 .Os
 .Sh NAME
 .Nm aw_gpio
diff --git a/share/man/man4/man4.arm/aw_mmc.4 b/share/man/man4/aw_mmc.4
rename from share/man/man4/man4.arm/aw_mmc.4
rename to share/man/man4/aw_mmc.4
--- a/share/man/man4/man4.arm/aw_mmc.4
+++ b/share/man/man4/aw_mmc.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd Dec 25, 2017
-.Dt AW_MMC 4 arm
+.Dt AW_MMC 4
 .Os
 .Sh NAME
 .Nm aw_mmc
diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/aw_rtc.4
rename from share/man/man4/man4.arm/aw_rtc.4
rename to share/man/man4/aw_rtc.4
--- a/share/man/man4/man4.arm/aw_rtc.4
+++ b/share/man/man4/aw_rtc.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd December 10, 2024
-.Dt AW_RTC 4 arm
+.Dt AW_RTC 4
 .Os
 .Sh NAME
 .Nm aw_rtc
diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/aw_sid.4
rename from share/man/man4/man4.arm/aw_sid.4
rename to share/man/man4/aw_sid.4
--- a/share/man/man4/man4.arm/aw_sid.4
+++ b/share/man/man4/aw_sid.4
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd October 8, 2024
-.Dt AW_SID 4 arm
+.Dt AW_SID 4
 .Os
 .Sh NAME
 .Nm aw_sid
diff --git a/share/man/man4/man4.arm/aw_spi.4 b/share/man/man4/aw_spi.4
rename from share/man/man4/man4.arm/aw_spi.4
rename to share/man/man4/aw_spi.4
diff --git a/share/man/man4/man4.arm/aw_syscon.4 b/share/man/man4/aw_syscon.4
rename from share/man/man4/man4.arm/aw_syscon.4
rename to share/man/man4/aw_syscon.4
--- a/share/man/man4/man4.arm/aw_syscon.4
+++ b/share/man/man4/aw_syscon.4
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd November 11, 2024
-.Dt AW_SYSCON 4 arm
+.Dt AW_SYSCON 4
 .Os
 .Sh NAME
 .Nm aw_syscon
diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile
--- a/share/man/man4/man4.aarch64/Makefile
+++ b/share/man/man4/man4.aarch64/Makefile
@@ -14,12 +14,6 @@
 # for all architectures, otherwise arm takes care of installing them.
 .if !empty(MAN_ARCH) && ${MAN_ARCH} != "all"
 MAN+=	\
-	aw_gpio.4 \
-	aw_mmc.4 \
-	aw_rtc.4 \
-	aw_sid.4 \
-	aw_spi.4 \
-	aw_syscon.4 \
 	bcm283x_pwm.4 \
 
 .endif
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -1,11 +1,5 @@
 MAN=	\
 	ar40xx.4 \
-	aw_gpio.4 \
-	aw_mmc.4 \
-	aw_rtc.4 \
-	aw_sid.4 \
-	aw_spi.4 \
-	aw_syscon.4 \
 	bcm283x_pwm.4 \
 	devcfg.4 \
 	imx6_ahci.4 \