Index: sbin/Makefile
===================================================================
--- sbin/Makefile
+++ sbin/Makefile
@@ -90,6 +90,12 @@
 
 SUBDIR.${MK_TESTS}+=	tests
 
+# Add architecture-specific manpages
+# to be included anyway
+MAN=   sconfig/sconfig.8
+
+.include <bsd.prog.mk>
+
 .include <bsd.arch.inc.mk>
 
 SUBDIR_PARALLEL=
Index: share/man/man4/Makefile
===================================================================
--- share/man/man4/Makefile
+++ share/man/man4/Makefile
@@ -895,9 +895,7 @@
 MLINKS+=cgem.4 if_cgem.4
 .endif
 
-.if empty(MAN_ARCH)
-__arches=	${MACHINE} ${MACHINE_ARCH} ${MACHINE_CPUARCH}
-.elif ${MAN_ARCH} == "all"
+.if empty(MAN_ARCH) || ${MAN_ARCH} == "all"
 __arches=	${:!/bin/sh -c "/bin/ls -d ${.CURDIR}/man4.*"!:E}
 .else
 __arches=	${MAN_ARCH}
Index: share/man/man4/man4.aarch64/Makefile
===================================================================
--- share/man/man4/man4.aarch64/Makefile
+++ share/man/man4/man4.aarch64/Makefile
@@ -16,6 +16,11 @@
 	rk_i2c.4 \
 	rk_pinctrl.4 \
 
+# Link files to the parent directory
+.for _manpage in ${MAN}
+MLINKS+=${_manpage} ../${_manpage}
+.endfor
+
 MANSUBDIR=/aarch64
 
 .include <bsd.prog.mk>
Index: share/man/man4/man4.arm/Makefile
===================================================================
--- share/man/man4/man4.arm/Makefile
+++ share/man/man4/man4.arm/Makefile
@@ -18,6 +18,11 @@
 MLINKS= imx_wdog.4 imxwdt.4
 MLINKS+= mge.4 if_mge.4
 
+# Link files to the parent directory
+.for _manpage in ${MAN}
+MLINKS+=${_manpage} ../${_manpage}
+.endfor
+
 MANSUBDIR=/arm
 
 .include <bsd.prog.mk>
Index: share/man/man4/man4.i386/Makefile
===================================================================
--- share/man/man4/man4.i386/Makefile
+++ share/man/man4/man4.i386/Makefile
@@ -21,6 +21,11 @@
 MLINKS+=pae.4 PAE.4
 MLINKS+=sbni.4 if_sbni.4
 
+# Link files to the parent directory
+.for _manpage in ${MAN}
+MLINKS+=${_manpage} ../${_manpage}
+.endfor
+
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
Index: share/man/man4/man4.powerpc/Makefile
===================================================================
--- share/man/man4/man4.powerpc/Makefile
+++ share/man/man4/man4.powerpc/Makefile
@@ -15,6 +15,11 @@
 	snd_davbus.4 \
 	tsec.4
 
+# Link files to the parent directory
+.for _manpage in ${MAN}
+MLINKS+=${_manpage} ../${_manpage}
+.endfor
+
 MANSUBDIR=/powerpc
 
 .include <bsd.prog.mk>
Index: share/man/man5/make.conf.5
===================================================================
--- share/man/man5/make.conf.5
+++ share/man/man5/make.conf.5
@@ -385,7 +385,7 @@
 The special value
 .Sq all
 installs all available architectures.
-The default is the MACHINE and MACHINE_ARCH being built.
+It is also the default value.
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile
+++ usr.sbin/Makefile
@@ -213,6 +213,13 @@
 
 .include <bsd.arch.inc.mk>
 
+# Add architecture-specific manpages
+# to be included anyway
+MAN=   apmd/apmd.8 \
+       nvram/nvram.8
+
+.include <bsd.prog.mk>
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
Index: usr.sbin/apm/Makefile
===================================================================
--- usr.sbin/apm/Makefile
+++ usr.sbin/apm/Makefile
@@ -5,6 +5,10 @@
 MLINKS=	apm.8 apmconf.8
 MANSUBDIR= /${MACHINE_CPUARCH}
 
+# Link files to the parent directory
+MLINKS+= apm.8 ../apm.8
+MLINKS+= apmconf.8 ../apmconf.8
+
 PACKAGE=apm
 
 .include <bsd.prog.mk>