diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile
index 6d0e427e6b28..d1fbced3b0a8 100644
--- a/share/man/man4/man4.aarch64/Makefile
+++ b/share/man/man4/man4.aarch64/Makefile
@@ -4,6 +4,17 @@
 
 MAN=	\
 	armv8crypto.4 \
+	enetc.4 \
+	felix.4 \
+	rk_gpio.4 \
+	rk_grf.4 \
+	rk_i2c.4 \
+	rk_pinctrl.4 \
+
+# Install manpages shared with arm only if not installing manpages
+# 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 \
@@ -11,18 +22,13 @@ MAN=	\
 	aw_spi.4 \
 	aw_syscon.4 \
 	bcm283x_pwm.4 \
-	enetc.4 \
-	felix.4 \
-	rk_gpio.4 \
-	rk_grf.4 \
-	rk_i2c.4 \
-	rk_pinctrl.4 \
 
-# Link files to the parent directory
+.endif
+
+# Link files to the architecture directory.
+_ARCH_SUBDIR=aarch64
 .for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
 .endfor
 
-MANSUBDIR=/aarch64
-
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
index 2ac8dbb5fd81..76146f4ebdb7 100644
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -18,11 +18,13 @@ MAN=	\
 MLINKS= imx_wdog.4 imxwdt.4
 MLINKS+= mge.4 if_mge.4
 
-# Link files to the parent directory
+# Link files to the architecture directory
+_ARCH_SUBDIR=arm
+.for _manpage _link in ${MLINKS}
+MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link}
+.endfor
 .for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
 .endfor
 
-MANSUBDIR=/arm
-
 .include <bsd.prog.mk>