diff --git a/sbin/Makefile b/sbin/Makefile
index 64840bae82bb..f53e2f037ebe 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,97 +1,103 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=adjkerntz \
 	camcontrol \
 	clri \
 	comcontrol \
 	conscontrol \
 	ddb \
 	devfs \
 	devmatch \
 	dhclient \
 	dmesg \
 	dump \
 	dumpfs \
 	dumpon \
 	etherswitchcfg \
 	ffsinfo \
 	fsck \
 	fsck_ffs \
 	fsck_msdosfs \
 	fsdb \
 	fsirand \
 	gbde \
 	geom \
 	ggate \
 	growfs \
 	gvinum \
 	ifconfig \
 	init \
 	kldconfig \
 	kldload \
 	kldstat \
 	kldunload \
 	ldconfig \
 	md5 \
 	mdconfig \
 	mdmfs \
 	mknod \
 	mksnap_ffs \
 	mount \
 	mount_cd9660 \
 	mount_fusefs \
 	mount_msdosfs \
 	mount_nfs \
 	mount_nullfs \
 	mount_udf \
 	mount_unionfs \
 	newfs \
 	newfs_msdos \
 	nfsiod \
 	nos-tun \
 	pfilctl \
 	ping \
 	rcorder \
 	reboot \
 	recoverdisk \
 	resolvconf \
 	restore \
 	route \
 	savecore \
 	setkey \
 	shutdown \
 	spppcontrol \
 	swapon \
 	sysctl \
 	tunefs \
 	umount
 
 SUBDIR.${MK_CCD}+=	ccdconfig
 SUBDIR.${MK_CXX}+=	devd
 SUBDIR.${MK_HAST}+=	hastctl
 SUBDIR.${MK_HAST}+=	hastd
 SUBDIR.${MK_INET6}+=	rtsol
 SUBDIR.${MK_IPFILTER}+=	ipf
 SUBDIR.${MK_IPFW}+=	ipfw
 SUBDIR.${MK_IPFW}+=	natd
 SUBDIR.${MK_ISCSI}+=	iscontrol
 SUBDIR.${MK_NVME}+=	nvmecontrol
 SUBDIR.${MK_OPENSSL}+=	decryptcore
 SUBDIR.${MK_PF}+=	pfctl
 SUBDIR.${MK_PF}+=	pflogd
 SUBDIR.${MK_QUOTAS}+=	quotacheck
 SUBDIR.${MK_ROUTED}+=	routed
 SUBDIR.${MK_VERIEXEC}+=	veriexec
 SUBDIR.${MK_ZFS}+=	bectl
 SUBDIR.${MK_ZFS}+=	zfsbootcfg
 
 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=
 
 .include <bsd.subdir.mk>
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 5051470edc71..9027fe7df841 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,1041 +1,1039 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 MAN=	aac.4 \
 	aacraid.4 \
 	acpi.4 \
 	${_acpi_asus.4} \
 	${_acpi_asus_wmi.4} \
 	${_acpi_dock.4} \
 	${_acpi_fujitsu.4} \
 	${_acpi_hp.4} \
 	${_acpi_ibm.4} \
 	${_acpi_panasonic.4} \
 	${_acpi_rapidstart.4} \
 	${_acpi_sony.4} \
 	acpi_thermal.4 \
 	acpi_battery.4 \
 	${_acpi_toshiba.4} \
 	acpi_video.4 \
 	${_acpi_wmi.4} \
 	ada.4 \
 	adm6996fc.4 \
 	ads111x.4 \
 	ae.4 \
 	${_aesni.4} \
 	age.4 \
 	agp.4 \
 	ahc.4 \
 	ahci.4 \
 	ahd.4 \
 	${_aibs.4} \
 	aio.4 \
 	alc.4 \
 	ale.4 \
 	alpm.4 \
 	altera_atse.4 \
 	altera_avgen.4 \
 	altera_jtag_uart.4 \
 	altera_sdcard.4 \
 	altq.4 \
 	amdpm.4 \
 	${_amdsbwd.4} \
 	${_amdsmb.4} \
 	${_amdsmn.4} \
 	${_amdtemp.4} \
 	${_bxe.4} \
 	amr.4 \
 	${_aout.4} \
 	${_apic.4} \
 	arcmsr.4 \
 	${_asmc.4} \
 	at45d.4 \
 	ata.4 \
 	ath.4 \
 	ath_ahb.4 \
 	ath_hal.4 \
 	ath_pci.4 \
 	atkbd.4 \
 	atkbdc.4 \
 	atp.4 \
 	${_atf_test_case.4} \
 	${_atrtc.4} \
 	${_attimer.4} \
 	audit.4 \
 	auditpipe.4 \
 	aue.4 \
 	axe.4 \
 	axge.4 \
 	axp.4 \
 	bce.4 \
 	bcma.4 \
 	bfe.4 \
 	bge.4 \
 	${_bhyve.4} \
 	bhnd.4 \
 	bhnd_chipc.4 \
 	bhnd_pmu.4 \
 	bhndb.4 \
 	bhndb_pci.4 \
 	blackhole.4 \
 	bnxt.4 \
 	bpf.4 \
 	bridge.4 \
 	bwi.4 \
 	bwn.4 \
 	${_bytgpio.4} \
 	capsicum.4 \
 	cardbus.4 \
 	carp.4 \
 	cas.4 \
 	cc_cdg.4 \
 	cc_chd.4 \
 	cc_cubic.4 \
 	cc_dctcp.4 \
 	cc_hd.4 \
 	cc_htcp.4 \
 	cc_newreno.4 \
 	cc_vegas.4 \
 	${_ccd.4} \
 	ccr.4 \
 	cd.4 \
 	cdce.4 \
 	cdceem.4 \
 	cfi.4 \
 	cfumass.4 \
 	${_cgem.4} \
 	ch.4 \
 	chromebook_platform.4 \
 	${_chvgpio.4} \
 	ciss.4 \
 	cloudabi.4 \
 	${_coretemp.4} \
 	cp2112.4 \
 	${_cpuctl.4} \
 	cpufreq.4 \
 	crypto.4 \
 	ctl.4 \
 	cue.4 \
 	cxgb.4 \
 	cxgbe.4 \
 	cxgbev.4 \
 	cyapa.4 \
 	da.4 \
 	dc.4 \
 	dcons.4 \
 	dcons_crom.4 \
 	ddb.4 \
 	devctl.4 \
 	disc.4 \
 	disk.4 \
 	divert.4 \
 	${_dpms.4} \
 	ds1307.4 \
 	ds3231.4 \
 	${_dtrace_provs} \
 	dummynet.4 \
 	edsc.4 \
 	ehci.4 \
 	em.4 \
 	ena.4 \
 	enc.4 \
 	epair.4 \
 	esp.4 \
 	est.4 \
 	et.4 \
 	etherswitch.4 \
 	eventtimers.4 \
 	exca.4 \
 	e6060sw.4 \
 	fd.4 \
 	fdc.4 \
 	fdt.4 \
 	fdt_pinctrl.4 \
 	fdtbus.4 \
 	ffclock.4 \
 	filemon.4 \
 	firewire.4 \
 	${_ftwd.4} \
 	full.4 \
 	fwe.4 \
 	fwip.4 \
 	fwohci.4 \
 	fxp.4 \
 	gbde.4 \
 	gdb.4 \
 	gem.4 \
 	geom.4 \
 	geom_linux_lvm.4 \
 	geom_map.4 \
 	geom_uzip.4 \
 	gif.4 \
 	gpio.4 \
 	gpioiic.4 \
 	gpiokeys.4 \
 	gpioled.4 \
 	gpioths.4 \
 	gre.4 \
 	h_ertt.4 \
 	hconf.4 \
 	hcons.4 \
 	hgame.4 \
 	hidbus.4 \
 	hidquirk.4 \
 	hidraw.4 \
 	hifn.4 \
 	hkbd.4 \
 	hms.4 \
 	hmt.4 \
 	hpen.4 \
 	hpet.4 \
 	${_hpt27xx.4} \
 	${_hptiop.4} \
 	${_hptmv.4} \
 	${_hptnr.4} \
 	${_hptrr.4} \
 	hsctrl.4 \
 	htu21.4 \
 	${_hv_kvp.4} \
 	${_hv_netvsc.4} \
 	${_hv_storvsc.4} \
 	${_hv_utils.4} \
 	${_hv_vmbus.4} \
 	${_hv_vss.4} \
 	hwpmc.4 \
 	${_hwpstate_intel.4} \
 	iavf.4 \
 	ichsmb.4 \
 	${_ichwd.4} \
 	icmp.4 \
 	icmp6.4 \
 	ida.4 \
 	if_ipsec.4 \
 	iflib.4 \
 	ifmib.4 \
 	ig4.4 \
 	igmp.4 \
 	iic.4 \
 	iic_gpiomux.4 \
 	iicbb.4 \
 	iicbus.4 \
 	iichid.4 \
 	iicmux.4 \
 	iicsmb.4 \
 	iir.4 \
 	${_imcsmb.4} \
 	inet.4 \
 	inet6.4 \
 	intpm.4 \
 	intro.4 \
 	${_io.4} \
 	${_ioat.4} \
 	ip.4 \
 	ip6.4 \
 	ipfirewall.4 \
 	ipheth.4 \
 	${_ipmi.4} \
 	ips.4 \
 	ipsec.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
 	isl.4 \
 	ismt.4 \
 	isp.4 \
 	ispfw.4 \
 	${_itwd.4} \
 	iwi.4 \
 	iwifw.4 \
 	iwm.4 \
 	iwmfw.4 \
 	iwn.4 \
 	iwnfw.4 \
 	ixgbe.4 \
 	ixl.4 \
 	jedec_dimm.4 \
 	jme.4 \
 	kbdmux.4 \
 	kcov.4 \
 	keyboard.4 \
 	kld.4 \
 	ksyms.4 \
 	ksz8995ma.4 \
 	ktls.4 \
 	ktr.4 \
 	kue.4 \
 	lagg.4 \
 	le.4 \
 	led.4 \
 	lge.4 \
 	${_linux.4} \
 	liquidio.4 \
 	lm75.4 \
 	lo.4 \
 	lp.4 \
 	lpbb.4 \
 	lpt.4 \
 	ltc430x.4 \
 	mac.4 \
 	mac_biba.4 \
 	mac_bsdextended.4 \
 	mac_ifoff.4 \
 	mac_lomac.4 \
 	mac_mls.4 \
 	mac_none.4 \
 	mac_ntpd.4 \
 	mac_partition.4 \
 	mac_portacl.4 \
 	mac_seeotheruids.4 \
 	mac_stub.4 \
 	mac_test.4 \
 	malo.4 \
 	md.4 \
 	mdio.4 \
 	me.4 \
 	mem.4 \
 	meteor.4 \
 	mfi.4 \
 	miibus.4 \
 	mld.4 \
 	mlx.4 \
 	mlx4en.4 \
 	mlx5en.4 \
 	mly.4 \
 	mmc.4 \
 	mmcsd.4 \
 	mod_cc.4 \
 	mos.4 \
 	mouse.4 \
 	mpr.4 \
 	mps.4 \
 	mpt.4 \
 	mrsas.4 \
 	msk.4 \
 	mtio.4 \
 	multicast.4 \
 	muge.4 \
 	mvs.4 \
 	mwl.4 \
 	mwlfw.4 \
 	mx25l.4 \
 	mxge.4 \
 	my.4 \
 	net80211.4 \
 	netdump.4 \
 	netfpga10g_nf10bmac.4 \
 	netgdb.4 \
 	netgraph.4 \
 	netintro.4 \
 	netmap.4 \
 	${_nfe.4} \
 	${_nfsmb.4} \
 	ng_async.4 \
 	ngatmbase.4 \
 	ng_atmllc.4 \
 	ng_bpf.4 \
 	ng_bridge.4 \
 	ng_btsocket.4 \
 	ng_car.4 \
 	ng_ccatm.4 \
 	ng_checksum.4 \
 	ng_cisco.4 \
 	ng_deflate.4 \
 	ng_device.4 \
 	nge.4 \
 	ng_echo.4 \
 	ng_eiface.4 \
 	ng_etf.4 \
 	ng_ether.4 \
 	ng_ether_echo.4 \
 	ng_frame_relay.4 \
 	ng_gif.4 \
 	ng_gif_demux.4 \
 	ng_h4.4 \
 	ng_hci.4 \
 	ng_hole.4 \
 	ng_hub.4 \
 	ng_iface.4 \
 	ng_ipfw.4 \
 	ng_ip_input.4 \
 	ng_ksocket.4 \
 	ng_l2cap.4 \
 	ng_l2tp.4 \
 	ng_lmi.4 \
 	ng_macfilter.4 \
 	ng_mppc.4 \
 	ng_nat.4 \
 	ng_netflow.4 \
 	ng_one2many.4 \
 	ng_patch.4 \
 	ng_pipe.4 \
 	ng_ppp.4 \
 	ng_pppoe.4 \
 	ng_pptpgre.4 \
 	ng_pred1.4 \
 	ng_rfc1490.4 \
 	ng_socket.4 \
 	ng_source.4 \
 	ng_split.4 \
 	ng_sppp.4 \
 	ng_sscfu.4 \
 	ng_sscop.4 \
 	ng_tag.4 \
 	ng_tcpmss.4 \
 	ng_tee.4 \
 	ng_tty.4 \
 	ng_ubt.4 \
 	ng_UI.4 \
 	ng_uni.4 \
 	ng_vjc.4 \
 	ng_vlan.4 \
 	ng_vlan_rotate.4 \
 	nmdm.4 \
 	${_ntb.4} \
 	${_ntb_hw_amd.4} \
 	${_ntb_hw_intel.4} \
 	${_ntb_hw_plx.4} \
 	${_ntb_transport.4} \
 	${_nda.4} \
 	${_if_ntb.4} \
 	null.4 \
 	numa.4 \
 	${_nvd.4} \
 	${_nvdimm.4} \
 	${_nvme.4} \
 	${_nvram.4} \
 	${_nvram2env.4} \
 	oce.4 \
 	ocs_fc.4\
 	ohci.4 \
 	openfirm.4 \
 	orm.4 \
 	${_ossl.4} \
 	ow.4 \
 	ow_temp.4 \
 	owc.4 \
 	${_padlock.4} \
 	pass.4 \
 	pccard.4 \
 	pccbb.4 \
 	pcf.4 \
 	${_pchtherm.4} \
 	pci.4 \
 	pcib.4 \
 	pcic.4 \
 	pcm.4 \
 	${_pf.4} \
 	${_pflog.4} \
 	${_pfsync.4} \
 	pim.4 \
 	pms.4 \
 	polling.4 \
 	ppbus.4 \
 	ppc.4 \
 	ppi.4 \
 	procdesc.4 \
 	proto.4 \
 	ps4dshock.4 \
 	psm.4 \
 	pst.4 \
 	pt.4 \
 	ptnet.4 \
 	pts.4 \
 	pty.4 \
 	puc.4 \
 	pwmc.4 \
 	${_qat.4} \
 	${_qlxge.4} \
 	${_qlxgb.4} \
 	${_qlxgbe.4} \
 	${_qlnxe.4} \
 	ral.4 \
 	random.4 \
 	rctl.4 \
 	re.4 \
 	rgephy.4 \
 	rights.4 \
 	rl.4 \
 	rndtest.4 \
 	route.4 \
 	rtsx.4 \
 	rtwn.4 \
 	rtwnfw.4 \
 	rtwn_pci.4 \
 	rue.4 \
 	sa.4 \
 	safe.4 \
 	safexcel.4 \
 	sbp.4 \
 	sbp_targ.4 \
 	scc.4 \
 	sched_4bsd.4 \
 	sched_ule.4 \
 	screen.4 \
 	scsi.4 \
 	sctp.4 \
 	sdhci.4 \
 	sem.4 \
 	send.4 \
 	ses.4 \
 	${_sfxge.4} \
 	sge.4 \
 	siba.4 \
 	siftr.4 \
 	siis.4 \
 	simplebus.4 \
 	sis.4 \
 	sk.4 \
 	${_smartpqi.4} \
 	smb.4 \
 	smbios.4 \
 	smbus.4 \
 	smp.4 \
 	smsc.4 \
 	snd_ad1816.4 \
 	snd_als4000.4 \
 	snd_atiixp.4 \
 	snd_cmi.4 \
 	snd_cs4281.4 \
 	snd_csa.4 \
 	snd_ds1.4 \
 	snd_emu10k1.4 \
 	snd_emu10kx.4 \
 	snd_envy24.4 \
 	snd_envy24ht.4 \
 	snd_es137x.4 \
 	snd_ess.4 \
 	snd_fm801.4 \
 	snd_gusc.4 \
 	snd_hda.4 \
 	snd_hdspe.4 \
 	snd_ich.4 \
 	snd_maestro3.4 \
 	snd_maestro.4 \
 	snd_mss.4 \
 	snd_neomagic.4 \
 	snd_sbc.4 \
 	snd_solo.4 \
 	snd_spicds.4 \
 	snd_t4dwave.4 \
 	snd_uaudio.4 \
 	snd_via8233.4 \
 	snd_via82c686.4 \
 	snd_vibes.4 \
 	sndstat.4 \
 	snp.4 \
 	spigen.4 \
 	${_spkr.4} \
 	splash.4 \
 	sppp.4 \
 	ste.4 \
 	stf.4 \
 	stge.4 \
 	${_sume.4} \
 	${_superio.4} \
 	sym.4 \
 	syncache.4 \
 	syncer.4 \
 	syscons.4 \
 	sysmouse.4 \
 	tap.4 \
 	targ.4 \
 	tcp.4 \
 	tcp_bbr.4 \
 	tdfx.4 \
 	terasic_mtl.4 \
 	termios.4 \
 	textdump.4 \
 	ti.4 \
 	timecounters.4 \
 	${_tpm.4} \
 	tty.4 \
 	tun.4 \
 	twa.4 \
 	twe.4 \
 	tws.4 \
 	udp.4 \
 	udplite.4 \
 	ure.4 \
 	vale.4 \
 	vga.4 \
 	vge.4 \
 	viapm.4 \
 	${_viawd.4} \
 	virtio.4 \
 	virtio_balloon.4 \
 	virtio_blk.4 \
 	virtio_console.4 \
 	virtio_random.4 \
 	virtio_scsi.4 \
 	${_vmci.4} \
 	vkbd.4 \
 	vlan.4 \
 	vxlan.4 \
 	${_vmd.4} \
 	${_vmm.4} \
 	${_vmx.4} \
 	vr.4 \
 	vt.4 \
 	vte.4 \
 	vtnet.4 \
 	watchdog.4 \
 	${_wbwd.4} \
 	witness.4 \
 	wlan.4 \
 	wlan_acl.4 \
 	wlan_amrr.4 \
 	wlan_ccmp.4 \
 	wlan_tkip.4 \
 	wlan_wep.4 \
 	wlan_xauth.4 \
 	wmt.4 \
 	${_wpi.4} \
 	wsp.4 \
 	xb360gp.4 \
 	${_xen.4} \
 	xhci.4 \
 	xl.4 \
 	${_xnb.4} \
 	xpt.4 \
 	zero.4
 
 MLINKS=	ads111x.4 ads1013.4 \
 	ads111x.4 ads1014.4 \
 	ads111x.4 ads1015.4 \
 	ads111x.4 ads1113.4 \
 	ads111x.4 ads1114.4 \
 	ads111x.4 ads1115.4
 MLINKS+=ae.4 if_ae.4
 MLINKS+=age.4 if_age.4
 MLINKS+=agp.4 agpgart.4
 MLINKS+=alc.4 if_alc.4
 MLINKS+=ale.4 if_ale.4
 MLINKS+=altera_atse.4 atse.4
 MLINKS+=altera_sdcard.4 altera_sdcardc.4
 MLINKS+=altq.4 ALTQ.4
 MLINKS+=ath.4 if_ath.4
 MLINKS+=ath_pci.4 if_ath_pci.4
 MLINKS+=aue.4 if_aue.4
 MLINKS+=axe.4 if_axe.4
 MLINKS+=bce.4 if_bce.4
 MLINKS+=bfe.4 if_bfe.4
 MLINKS+=bge.4 if_bge.4
 MLINKS+=bnxt.4 if_bnxt.4
 MLINKS+=bridge.4 if_bridge.4
 MLINKS+=bwi.4 if_bwi.4
 MLINKS+=bwn.4 if_bwn.4
 MLINKS+=${_bxe.4} ${_if_bxe.4}
 MLINKS+=cas.4 if_cas.4
 MLINKS+=cdce.4 if_cdce.4
 MLINKS+=cfi.4 cfid.4
 MLINKS+=cloudabi.4 cloudabi32.4 \
 	cloudabi.4 cloudabi64.4
 MLINKS+=crypto.4 cryptodev.4
 MLINKS+=cue.4 if_cue.4
 MLINKS+=cxgb.4 if_cxgb.4
 MLINKS+=cxgbe.4 if_cxgbe.4 \
 	cxgbe.4 vcxgbe.4 \
 	cxgbe.4 if_vcxgbe.4 \
 	cxgbe.4 cxl.4 \
 	cxgbe.4 if_cxl.4 \
 	cxgbe.4 vcxl.4 \
 	cxgbe.4 if_vcxl.4 \
 	cxgbe.4 cc.4 \
 	cxgbe.4 if_cc.4 \
 	cxgbe.4 vcc.4 \
 	cxgbe.4 if_vcc.4
 MLINKS+=cxgbev.4 if_cxgbev.4 \
 	cxgbev.4 cxlv.4 \
 	cxgbev.4 if_cxlv.4 \
 	cxgbev.4 ccv.4 \
 	cxgbev.4 if_ccv.4
 MLINKS+=dc.4 if_dc.4
 MLINKS+=disc.4 if_disc.4
 MLINKS+=edsc.4 if_edsc.4
 MLINKS+=em.4 if_em.4 \
 	em.4 igb.4 \
 	em.4 if_igb.4
 MLINKS+=enc.4 if_enc.4
 MLINKS+=epair.4 if_epair.4
 MLINKS+=et.4 if_et.4
 MLINKS+=fd.4 stderr.4 \
 	fd.4 stdin.4 \
 	fd.4 stdout.4
 MLINKS+=fdt.4 FDT.4
 MLINKS+=firewire.4 ieee1394.4
 MLINKS+=fwe.4 if_fwe.4
 MLINKS+=fwip.4 if_fwip.4
 MLINKS+=fxp.4 if_fxp.4
 MLINKS+=gem.4 if_gem.4
 MLINKS+=geom.4 GEOM.4
 MLINKS+=gif.4 if_gif.4
 MLINKS+=gpio.4 gpiobus.4
 MLINKS+=gpioths.4 dht11.4
 MLINKS+=gpioths.4 dht22.4
 MLINKS+=gre.4 if_gre.4
 MLINKS+=hpet.4 acpi_hpet.4
 MLINKS+=${_hptrr.4} ${_rr232x.4}
 MLINKS+=${_attimer.4} ${_i8254.4}
 MLINKS+=ip.4 rawip.4
 MLINKS+=ipfirewall.4 ipaccounting.4 \
 	ipfirewall.4 ipacct.4 \
 	ipfirewall.4 ipfw.4
 MLINKS+=ipheth.4 if_ipheth.4
 MLINKS+=ipw.4 if_ipw.4
 MLINKS+=iwi.4 if_iwi.4
 MLINKS+=iwm.4 if_iwm.4
 MLINKS+=iwn.4 if_iwn.4
 MLINKS+=ixgbe.4 ix.4
 MLINKS+=ixgbe.4 if_ix.4
 MLINKS+=ixgbe.4 if_ixgbe.4
 MLINKS+=ixl.4 if_ixl.4
 MLINKS+=iavf.4 if_iavf.4
 MLINKS+=jme.4 if_jme.4
 MLINKS+=kue.4 if_kue.4
 MLINKS+=lagg.4 trunk.4
 MLINKS+=lagg.4 if_lagg.4
 MLINKS+=le.4 if_le.4
 MLINKS+=lge.4 if_lge.4
 MLINKS+=lo.4 loop.4
 MLINKS+=lp.4 plip.4
 MLINKS+=malo.4 if_malo.4
 MLINKS+=md.4 vn.4
 MLINKS+=mem.4 kmem.4
 MLINKS+=mfi.4 mfi_linux.4 \
 	mfi.4 mfip.4
 MLINKS+=mlx5en.4 mce.4
 MLINKS+=mos.4 if_mos.4
 MLINKS+=msk.4 if_msk.4
 MLINKS+=mwl.4 if_mwl.4
 MLINKS+=mxge.4 if_mxge.4
 MLINKS+=my.4 if_my.4
 MLINKS+=netfpga10g_nf10bmac.4 if_nf10bmac.4
 MLINKS+=netintro.4 net.4 \
 	netintro.4 networking.4
 MLINKS+=${_nfe.4} ${_if_nfe.4}
 MLINKS+=nge.4 if_nge.4
 MLINKS+=openfirm.4 openfirmware.4
 MLINKS+=ow.4 onewire.4
 MLINKS+=pccbb.4 cbb.4
 MLINKS+=pcm.4 snd.4 \
 	pcm.4 sound.4
 MLINKS+=pms.4 pmspcv.4
 MLINKS+=ptnet.4 if_ptnet.4
 MLINKS+=ral.4 if_ral.4
 MLINKS+=re.4 if_re.4
 MLINKS+=rl.4 if_rl.4
 MLINKS+=rtwn_pci.4 if_rtwn_pci.4
 MLINKS+=rue.4 if_rue.4
 MLINKS+=scsi.4 CAM.4 \
 	scsi.4 cam.4 \
 	scsi.4 scbus.4 \
 	scsi.4 SCSI.4
 MLINKS+=sge.4 if_sge.4
 MLINKS+=sis.4 if_sis.4
 MLINKS+=sk.4 if_sk.4
 MLINKS+=smp.4 SMP.4
 MLINKS+=smsc.4 if_smsc.4
 MLINKS+=snd_envy24.4 snd_ak452x.4
 MLINKS+=snd_sbc.4 snd_sb16.4 \
 	snd_sbc.4 snd_sb8.4
 MLINKS+=${_spkr.4} ${_speaker.4}
 MLINKS+=splash.4 screensaver.4
 MLINKS+=ste.4 if_ste.4
 MLINKS+=stf.4 if_stf.4
 MLINKS+=stge.4 if_stge.4
 MLINKS+=syncache.4 syncookies.4
 MLINKS+=syscons.4 sc.4
 MLINKS+=tap.4 if_tap.4 \
 	tap.4 vmnet.4 \
 	tap.4 if_vmnet.4
 MLINKS+=tdfx.4 tdfx_linux.4
 MLINKS+=ti.4 if_ti.4
 MLINKS+=tun.4 if_tun.4
 MLINKS+=ure.4 if_ure.4
 MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vxlan.4 if_vxlan.4
 MLINKS+=${_vmx.4} ${_if_vmx.4}
 MLINKS+=vr.4 if_vr.4
 MLINKS+=vte.4 if_vte.4
 MLINKS+=vtnet.4 if_vtnet.4
 MLINKS+=watchdog.4 SW_WATCHDOG.4
 MLINKS+=${_wpi.4} ${_if_wpi.4}
 MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _acpi_asus.4=	acpi_asus.4
 _acpi_asus_wmi.4=	acpi_asus_wmi.4
 _acpi_dock.4=	acpi_dock.4
 _acpi_fujitsu.4=acpi_fujitsu.4
 _acpi_hp.4=	acpi_hp.4
 _acpi_ibm.4=	acpi_ibm.4
 _acpi_panasonic.4=acpi_panasonic.4
 _acpi_rapidstart.4=acpi_rapidstart.4
 _acpi_sony.4=	acpi_sony.4
 _acpi_toshiba.4=acpi_toshiba.4
 _acpi_wmi.4=	acpi_wmi.4
 _aesni.4=	aesni.4
 _aout.4=	aout.4
 _apic.4=	apic.4
 _atrtc.4=	atrtc.4
 _attimer.4=	attimer.4
 _aibs.4=	aibs.4
 _amdsbwd.4=	amdsbwd.4
 _amdsmb.4=	amdsmb.4
 _amdsmn.4=	amdsmn.4
 _amdtemp.4=	amdtemp.4
 _asmc.4=	asmc.4
 _bxe.4=		bxe.4
 _bytgpio.4=	bytgpio.4
 _chvgpio.4=	chvgpio.4
 _coretemp.4=	coretemp.4
 _cpuctl.4=	cpuctl.4
 _dpms.4=	dpms.4
 _ftwd.4=	ftwd.4
 _hpt27xx.4=	hpt27xx.4
 _hptiop.4=	hptiop.4
 _hptmv.4=	hptmv.4
 _hptnr.4=	hptnr.4
 _hptrr.4=	hptrr.4
 _hv_kvp.4=	hv_kvp.4
 _hv_netvsc.4=	hv_netvsc.4
 _hv_storvsc.4=	hv_storvsc.4
 _hv_utils.4=	hv_utils.4
 _hv_vmbus.4=	hv_vmbus.4
 _hv_vss.4=	hv_vss.4
 _hwpstate_intel.4=	hwpstate_intel.4
 _i8254.4=	i8254.4
 _ichwd.4=	ichwd.4
 _if_bxe.4=	if_bxe.4
 _if_nfe.4=	if_nfe.4
 _if_urtw.4=	if_urtw.4
 _if_vmx.4=	if_vmx.4
 _if_wpi.4=	if_wpi.4
 _imcsmb.4=	imcsmb.4
 _ipmi.4=	ipmi.4
 _io.4=		io.4
 _itwd.4=	itwd.4
 _nda.4=		nda.4
 _nfe.4=		nfe.4
 _nfsmb.4=	nfsmb.4
 _if_ntb.4=	if_ntb.4
 _ntb.4=		ntb.4
 _ntb_hw_amd.4=	ntb_hw_amd.4
 _ntb_hw_intel.4=	ntb_hw_intel.4
 _ntb_hw_plx.4=	ntb_hw_plx.4
 _ntb_transport.4=ntb_transport.4
 _nvd.4=		nvd.4
 _nvme.4=	nvme.4
 _nvram.4=	nvram.4
 _padlock.4=	padlock.4
 _pchtherm.4=	pchtherm.4
 _qat.4=		qat.4
 _rr232x.4=	rr232x.4
 _speaker.4=	speaker.4
 _spkr.4=	spkr.4
 _superio.4=	superio.4
 _tpm.4=		tpm.4
 _urtw.4=	urtw.4
 _viawd.4=	viawd.4
 _vmci.4=	vmci.4
 _vmx.4=		vmx.4
 _wbwd.4=	wbwd.4
 _wpi.4=		wpi.4
 _xen.4=		xen.4
 _xnb.4=		xnb.4
 
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _ioat.4=	ioat.4
 _nvdimm.4=	nvdimm.4
 _qlxge.4=	qlxge.4
 _qlxgb.4=	qlxgb.4
 _qlxgbe.4=	qlxgbe.4
 _qlnxe.4=	qlnxe.4
 _sfxge.4=	sfxge.4
 _smartpqi.4=	smartpqi.4
 _sume.4=	sume.4
 _vmd.4=		vmd.4
 
 MLINKS+=qlxge.4 if_qlxge.4
 MLINKS+=qlxgb.4 if_qlxgb.4
 MLINKS+=qlxgbe.4 if_qlxgbe.4
 MLINKS+=qlnxe.4 if_qlnxe.4
 MLINKS+=sfxge.4 if_sfxge.4
 MLINKS+=sume.4 if_sume.4
 
 .if ${MK_BHYVE} != "no"
 _bhyve.4=	bhyve.4
 _vmm.4=		vmm.4
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
 _nvram2env.4=	nvram2env.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _nvd.4= 	nvd.4
 _nvme.4=	nvme.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
 	 ${MACHINE_CPUARCH} == "aarch64"
 _linux.4=	linux.4
 _ossl.4=	ossl.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \
 	 ${MACHINE_CPUARCH} == "riscv"
 _cgem.4=	cgem.4
 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}
 .endif
 .for __arch in ${__arches:O:u}
 .if exists(${.CURDIR}/man4.${__arch})
 SUBDIR+=	man4.${__arch}
 .endif
 .endfor
 
 .if ${MK_BLUETOOTH} != "no"
 MAN+=		ng_bluetooth.4
 .endif
 
 .if ${MK_CCD} != "no"
 _ccd.4=		ccd.4
 .endif
 
 .if ${MK_CDDL} != "no"
 _dtrace_provs=	dtrace_audit.4 \
 		dtrace_io.4 \
 		dtrace_ip.4 \
 		dtrace_lockstat.4 \
 		dtrace_proc.4 \
 		dtrace_sched.4 \
 		dtrace_sctp.4 \
 		dtrace_tcp.4 \
 		dtrace_udp.4 \
 		dtrace_udplite.4
 
 MLINKS+=	dtrace_audit.4 dtaudit.4
 .endif
 
 .if ${MK_EFI} != "no"
 MAN+=		efidev.4
 
 MLINKS+=	efidev.4 efirtc.4
 .endif
 
 .if ${MK_ISCSI} != "no"
 MAN+=		cfiscsi.4
 MAN+=		iscsi.4
 MAN+=		iscsi_initiator.4
 MAN+=		iser.4
 .endif
 
 .if ${MK_OFED} != "no"
 MAN+=		mlx4ib.4
 MAN+=		mlx5ib.4
 .endif
 
 .if ${MK_MLX5TOOL} != "no"
 MAN+=		mlx5io.4
 .endif
 
 .if ${MK_TESTS} != "no"
 ATF=            ${SRCTOP}/contrib/atf
 .PATH:          ${ATF}/doc
 _atf_test_case.4=	atf-test-case.4
 .endif
 
 .if ${MK_PF} != "no"
 _pf.4=		pf.4
 _pflog.4=	pflog.4
 _pfsync.4=	pfsync.4
 .endif
 
 .if ${MK_USB} != "no"
 MAN+=	\
 	otus.4 \
 	otusfw.4 \
 	rsu.4 \
 	rsufw.4 \
 	rtwn_usb.4 \
 	rum.4 \
 	run.4 \
 	runfw.4 \
 	u3g.4 \
 	uark.4 \
 	uart.4 \
 	uath.4 \
 	ubsa.4 \
 	ubser.4 \
 	ubtbcmfw.4 \
 	uchcom.4 \
 	ucom.4 \
 	ucycom.4 \
 	udav.4 \
 	udbp.4 \
 	udl.4 \
 	uep.4 \
 	ufoma.4 \
 	uftdi.4 \
 	ugen.4 \
 	ugold.4 \
 	uhci.4 \
 	uhid.4 \
 	uhso.4 \
 	uipaq.4 \
 	ukbd.4 \
 	uled.4 \
 	ulpt.4 \
 	umass.4 \
 	umcs.4 \
 	umct.4 \
 	umodem.4 \
 	umoscom.4 \
 	ums.4 \
 	unix.4 \
 	upgt.4 \
 	uplcom.4 \
 	ural.4 \
 	urio.4 \
 	urndis.4 \
 	${_urtw.4} \
 	usb.4 \
 	usb_quirk.4 \
 	usb_template.4 \
 	usbhid.4 \
 	usfs.4 \
 	uslcom.4 \
 	uvisor.4 \
 	uvscom.4 \
 	zyd.4
 
 MLINKS+=otus.4 if_otus.4
 MLINKS+=rsu.4 if_rsu.4
 MLINKS+=rtwn_usb.4 if_rtwn_usb.4
 MLINKS+=rum.4 if_rum.4
 MLINKS+=run.4 if_run.4
 MLINKS+=u3g.4 u3gstub.4
 MLINKS+=uath.4 if_uath.4
 MLINKS+=udav.4 if_udav.4
 MLINKS+=upgt.4 if_upgt.4
 MLINKS+=ural.4 if_ural.4
 MLINKS+=urndis.4 if_urndis.4
 MLINKS+=${_urtw.4} ${_if_urtw.4}
 MLINKS+=zyd.4 if_zyd.4
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile
index 6714a47011ef..ef5fcd84ccd4 100644
--- a/share/man/man4/man4.aarch64/Makefile
+++ b/share/man/man4/man4.aarch64/Makefile
@@ -1,22 +1,27 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../man4.arm # Some manpages are common to arm and aarch64
 
 MAN=	\
 	armv8crypto.4 \
 	aw_gpio.4 \
 	aw_mmc.4 \
 	aw_rtc.4 \
 	aw_sid.4 \
 	aw_spi.4 \
 	aw_syscon.4 \
 	bcm283x_pwm.4 \
 	enetc.4 \
 	rk_gpio.4 \
 	rk_grf.4 \
 	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>
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
index 0b3eec427934..2ac8dbb5fd81 100644
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -1,23 +1,28 @@
 # $FreeBSD$
 
 MAN=	\
 	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 \
 	imx6_snvs.4 \
 	imx_wdog.4 \
 	mge.4 \
 	ti_adc.4
 
 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>
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index a21b3cd6302b..e3d2e66ca78d 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,26 +1,31 @@
 # $FreeBSD$
 
 MAN=	apm.4 \
 	ce.4 \
 	cp.4 \
 	CPU_ELAN.4 \
 	glxiic.4 \
 	glxsb.4 \
 	longrun.4 \
 	npx.4 \
 	pae.4 \
 	pbio.4 \
 	perfmon.4 \
 	pnp.4 \
 	pnpbios.4 \
 	sbni.4 \
 	smapi.4 \
 	vpd.4
 
 MLINKS=	CPU_ELAN.4 CPU_SOEKRIS.4
 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>
diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile
index 05c5d4012fe8..aa0e137fcedd 100644
--- a/share/man/man4/man4.powerpc/Makefile
+++ b/share/man/man4/man4.powerpc/Makefile
@@ -1,20 +1,25 @@
 # $FreeBSD$
 
 MAN=	adb.4 \
 	akbd.4 \
 	abtn.4 \
 	ams.4 \
 	cuda.4 \
 	dtsec.4 \
 	llan.4 \
 	ofw_console.4 \
 	pmu.4 \
 	powermac_nvram.4 \
 	smu.4 \
 	snd_ai2s.4 \
 	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>
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 5885d9476d71..b3623b29a950 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -1,685 +1,685 @@
 .\" Copyright (c) 2000
 .\"	Mike W. Meyer
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"
 .Dd June 14, 2021
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
 .Nm make.conf
 .Nd system build information
 .Sh DESCRIPTION
 The file
 .Nm
 contains system-wide settings that will apply to every build using
 .Xr make 1
 and the standard
 .Pa sys.mk
 file.
 This is achieved as follows:
 .Xr make 1
 processes the system makefile
 .Pa sys.mk
 before any other file by default, and
 .Pa sys.mk
 includes
 .Nm .
 .Pp
 The file
 .Nm
 uses the standard makefile syntax.
 However,
 .Nm
 should not specify any dependencies to
 .Xr make 1 .
 Instead,
 .Nm
 is to set
 .Xr make 1
 variables that control the actions of other makefiles.
 .Pp
 The default location of
 .Nm
 is
 .Pa /etc/make.conf ,
 though an alternative location can be specified in the
 .Xr make 1
 variable
 .Va __MAKE_CONF .
 You may need to override the location of
 .Nm
 if the system-wide settings are not suitable for a particular build.
 For instance, setting
 .Va __MAKE_CONF
 to
 .Pa /dev/null
 effectively resets all build controls to their defaults.
 .Pp
 The primary purpose of
 .Nm
 is to control the compilation of the
 .Fx
 sources, documentation, and ported applications,
 which are usually found in
 .Pa /usr/src ,
 .Pa /usr/doc ,
 and
 .Pa /usr/ports .
 As a rule, the system administrator creates
 .Nm
 when the values of certain control variables need to be changed
 from their defaults.
 .Pp
 The system build procedures occur in four broad areas:
 the world, the kernel, documentation and ports.
 Variables set in
 .Nm
 may be applicable in one, two, or all four of these areas.
 In addition, control variables can be specified
 for a particular build via the
 .Fl D
 option of
 .Xr make 1
 or in
 .Xr environ 7 .
 In the case of world and kernel builds it is possible to put these variables
 into
 .Xr src.conf 5
 instead of
 .Nm .
 This way the environment for documentation and ports builds is not polluted
 by unrelated variables.
 .Pp
 The following lists provide a name and short description for each
 variable you can use during the indicated builds.
 The values of
 variables flagged as
 .Vt bool
 are ignored; the variable being
 set at all (even to
 .Dq Li FALSE
 or
 .Dq Li NO )
 causes it to
 be treated as if it were set.
 .Pp
 The following list provides a name and short description for variables
 that are used for all builds, or are used by the
 .Pa makefiles
 for things other than builds.
 .Bl -tag -width Ar
 .It Va ALWAYS_CHECK_MAKE
 .Pq Vt bool
 Instructs the top-level makefile in the source tree (normally
 .Pa /usr/src )
 to always check if
 .Xr make 1
 is up-to-date.
 Normally this is only done for the world and buildworld targets to handle
 upgrades from older versions of
 .Fx .
 .It Va CFLAGS
 .Pq Vt str
 Controls the compiler setting when compiling C code.
 Optimization levels other than
 .Fl O
 and
 .Fl O2
 are not supported.
 .It Va CPUTYPE
 .Pq Vt str
 Controls which processor should be targeted for generated
 code.
 This controls processor-specific optimizations in
 certain code (currently only OpenSSL) as well as modifying
 the value of
 .Va CFLAGS
 and
 .Va COPTFLAGS
 to contain the appropriate optimization directive to
 .Xr cc 1 .
 The automatic setting of
 .Va CFLAGS
 may be overridden using the
 .Va NO_CPU_CFLAGS
 variable.
 Refer to
 .Pa /usr/share/examples/etc/make.conf
 for a list of recognized
 .Va CPUTYPE
 options.
 .It Va CXXFLAGS
 .Pq Vt str
 Controls the compiler settings when compiling C++ code.
 .Va CXXFLAGS
 is initially set to the value of
 .Va CFLAGS .
 If you want to
 add to the
 .Va CXXFLAGS
 value, use
 .Dq Li +=
 instead of
 .Dq Li = .
 .It Va DTC
 .Pq Vt str
 Select the compiler for DTS (Device Tree Syntax) file.
 .Va DTC
 is initially set to the value of dtc
 .It Va INSTALL
 .Pq Vt str
 the default install command.
 To install only files for which the target differs or does not exist, use
 .Bd -literal -offset indent
 INSTALL+= -C
 .Ed
 Note that some makefiles (including those in
 .Pa /usr/share/mk )
 may hardcode options for the supplied install command.
 .It Va LOCAL_DIRS
 .Pq Vt str
 List any directories that should be entered when doing
 make's in
 .Pa /usr/src
 in this variable.
 .It Va MAKE_SHELL
 .Pq Vt str
 Controls the shell used internally by
 .Xr make 1
 to process the command scripts in makefiles.
 .Xr sh 1 ,
 .Xr ksh 1 ,
 and
 .Xr csh 1
 all currently supported.
 .Pp
 .Dl "MAKE_SHELL?=sh"
 .It Va MTREE_FOLLOWS_SYMLINKS
 .Pq Vt str
 Set this to
 .Dq Fl L
 to cause
 .Xr mtree 8
 to follow symlinks.
 .It Va NO_CPU_CFLAGS
 .Pq Vt str
 Setting this variable will prevent CPU specific compiler flags
 from being automatically added to
 .Va CFLAGS
 during compile time.
 .El
 .Ss "BUILDING THE KERNEL"
 The following list provides a name and short description for variables
 that are only used doing a kernel build:
 .Bl -tag -width Ar
 .It Va BOOTWAIT
 .Pq Vt int
 Controls the amount of time the kernel waits for a console keypress
 before booting the default kernel.
 The value is approximately milliseconds.
 Keypresses are accepted by the BIOS before booting from disk,
 making it possible to give custom boot parameters even when this is
 set to 0.
 .It Va COPTFLAGS
 .Pq Vt str
 Controls the compiler settings when building the
 kernel.
 Optimization levels above
 .Oo Fl O ( O2 , No ...\& ) Oc
 are not guaranteed to work.
 .It Va KERNCONF
 .Pq Vt str
 Controls which kernel configurations will be
 built by
 .Dq Li "${MAKE} buildkernel"
 and installed by
 .Dq Li "${MAKE} installkernel" .
 For example,
 .Bd -literal -offset indent
 KERNCONF=MINE DEBUG GENERIC OTHERMACHINE
 .Ed
 .Pp
 will build the kernels specified by the config files
 .Pa MINE , DEBUG , GENERIC ,
 and
 .Pa OTHERMACHINE ,
 and install the kernel specified by the config file
 .Pa MINE .
 It defaults to
 .Pa GENERIC .
 .It Va MODULES_OVERRIDE
 .Pq Vt str
 Set to a list of modules to build instead of all of them.
 .It Va NO_KERNELCLEAN
 .Pq Vt bool
 Set this to skip running
 .Dq Li "${MAKE} clean"
 during
 .Dq Li "${MAKE} buildkernel" .
 .It Va NO_KERNELCONFIG
 .Pq Vt bool
 Set this to skip running
 .Xr config 8
 during
 .Dq Li "${MAKE} buildkernel" .
 .It Va NO_KERNELOBJ
 .Pq Vt bool
 Set this to skip running
 .Dq Li "${MAKE} obj"
 during
 .Dq Li "${MAKE} buildkernel" .
 .It Va NO_MODULES
 .Pq Vt bool
 Set to not build modules with the kernel.
 .It Va PORTS_MODULES
 Set this to the list of ports you wish to rebuild every time the kernel
 is built.
 .It Va WITHOUT_MODULES
 .Pq Vt str
 Set to a list of modules to exclude from the build.
 This provides a
 somewhat easier way to exclude modules you are certain you will never
 need than specifying
 .Va MODULES_OVERRIDE .
 This is applied
 .Em after
 .Va MODULES_OVERRIDE .
 .El
 .Ss "BUILDING THE WORLD"
 The following list provides a name and short description for variables
 that are used during the world build:
 .Bl -tag -width Ar
 .It Va BOOT_COMCONSOLE_PORT
 .Pq Vt str
 The port address to use for the console if the boot blocks have
 been configured to use a serial console instead of the keyboard/video card.
 .It Va BOOT_COMCONSOLE_SPEED
 .Pq Vt int
 The baud rate to use for the console if the boot blocks have
 been configured to use a serial console instead of the keyboard/video card.
 .It Va BOOT_PXELDR_ALWAYS_SERIAL
 .Pq Vt bool
 Compile in the code into
 .Xr pxeboot 8
 that forces the use of a serial console.
 This is analogous to the
 .Fl h
 option in
 .Xr boot 8
 blocks.
 .It Va BOOT_PXELDR_PROBE_KEYBOARD
 .Pq Vt bool
 Compile in the code into
 .Xr pxeboot 8
 that probes the keyboard.
 If no keyboard is found, boot with the dual console configuration.
 This is analogous to the
 .Fl D
 option in
 .Xr boot 8
 blocks.
 .It Va ENABLE_SUID_K5SU
 .Pq Vt bool
 Set this if you wish to use the ksu utility.
 Otherwise, it will be
 installed without the set-user-ID bit set.
 .It Va ENABLE_SUID_NEWGRP
 .Pq Vt bool
 Set this to install
 .Xr newgrp 1
 with the set-user-ID bit set.
 Otherwise,
 .Xr newgrp 1
 will not be able to change users' groups.
 .It Va LOADER_TFTP_SUPPORT
 .Pq Vt bool
 By default the
 .Xr pxeboot 8
 loader retrieves the kernel via NFS.
 Defining this and recompiling
 .Pa /usr/src/stand
 will cause it to retrieve the kernel via TFTP.
 This allows
 .Xr pxeboot 8
 to load a custom BOOTP diskless kernel yet
 still mount the server's
 .Pa /
 rather than load the server's kernel.
 .It Va LOADER_FIREWIRE_SUPPORT
 .Pq Vt bool
 Defining this and recompiling
 .Pa /usr/src/stand/i386
 will add
 .Xr dcons 4
 console driver to
 .Xr loader 8
 and allow access over FireWire(IEEE1394) using
 .Xr dconschat 8 .
 Currently, only i386 and amd64 are supported.
 .It Va MAN_ARCH
 .Pq Vt str
 Space-delimited list of one or more MACHINE and/or MACHINE_ARCH values
 for which section 4 man pages will be installed.
 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.
 .It Va NO_CLEAN
 .Pq Vt bool
 Set this to disable cleaning during
 .Dq Li "make buildworld" .
 This should not be set unless you know what you are doing.
 .It Va NO_CLEANDIR
 .Pq Vt bool
 Set this to run
 .Dq Li "${MAKE} clean"
 instead of
 .Dq Li "${MAKE} cleandir" .
 .It Va WITH_MANCOMPRESS
 .Pq Vt defined
 Set to install manual pages compressed.
 .It Va WITHOUT_MANCOMPRESS
 .Pq Vt defined
 Set to install manual pages uncompressed.
 .It Va NO_SHARE
 .Pq Vt bool
 Set to not build in the
 .Pa share
 subdir.
 .It Va NO_SHARED
 .Pq Vt bool
 Set to build
 .Pa /bin
 and
 .Pa /sbin
 statically linked, this can be bad.
 If set, every utility that uses
 .Pa bsd.prog.mk
 will be linked statically.
 .It Va PKG_REPO_SIGNING_KEY
 .Pq Vt str
 Path to rsa private key passed to
 .Xr pkg-repo 8
 to sign packages created when building the
 .Ar packages
 target, i.e.: pkgbase.
 The variable is named the same in
 .Xr poudriere 8
 so it will automatically be picked up when building pkgbase with poudriere.
 .It Va PPP_NO_NAT
 .Pq Vt bool
 Build
 .Xr ppp 8
 without support for network address translation (NAT).
 .It Va PPP_NO_NETGRAPH
 .Pq Vt bool
 Set to build
 .Xr ppp 8
 without support for Netgraph.
 .It Va PPP_NO_RADIUS
 .Pq Vt bool
 Set to build
 .Xr ppp 8
 without support for RADIUS.
 .It Va PPP_NO_SUID
 .Pq Vt bool
 Set to disable the installation of
 .Xr ppp 8
 as a set-user-ID root program.
 .It Va SENDMAIL_ADDITIONAL_MC
 .Pq Vt str
 Additional
 .Pa .mc
 files which should be built into
 .Pa .cf
 files at build time.
 The value should include the full path to the
 .Pa .mc
 file(s), e.g.,
 .Pa /etc/mail/foo.mc ,
 .Pa /etc/mail/bar.mc .
 .It Va SENDMAIL_ALIASES
 .Pq Vt str
 List of
 .Xr aliases 5
 files to rebuild when using
 .Pa /etc/mail/Makefile .
 The default value is
 .Pa /etc/mail/aliases .
 .It Va SENDMAIL_CFLAGS
 .Pq Vt str
 Flags to pass to the compile command when building
 .Xr sendmail 8 .
 The
 .Va SENDMAIL_*
 flags can be used to provide SASL support with setting such as:
 .Bd -literal -offset indent
 SENDMAIL_CFLAGS=-I/usr/local/include -DSASL
 SENDMAIL_LDFLAGS=-L/usr/local/lib
 SENDMAIL_LDADD=-lsasl
 .Ed
 .It Va SENDMAIL_CF_DIR
 .Pq Vt str
 Override the default location for the
 .Xr m4 1
 configuration files used to build a
 .Pa .cf
 file from a
 .Pa .mc
 file.
 .It Va SENDMAIL_DPADD
 .Pq Vt str
 Extra dependencies to add when building
 .Xr sendmail 8 .
 .It Va SENDMAIL_LDADD
 .Pq Vt str
 Flags to add to the end of the
 .Xr ld 1
 command when building
 .Xr sendmail 8 .
 .It Va SENDMAIL_LDFLAGS
 .Pq Vt str
 Flags to pass to the
 .Xr ld 1
 command when building
 .Xr sendmail 8 .
 .It Va SENDMAIL_M4_FLAGS
 .Pq Vt str
 Flags passed to
 .Xr m4 1
 when building a
 .Pa .cf
 file from a
 .Pa .mc
 file.
 .It Va SENDMAIL_MAP_PERMS
 .Pq Vt str
 Mode to use when generating alias and map database files using
 .Pa /etc/mail/Makefile .
 The default value is 0640.
 .It Va SENDMAIL_MAP_SRC
 .Pq Vt str
 Additional maps to rebuild when using
 .Pa /etc/mail/Makefile .
 The
 .Pa access ,
 .Pa bitdomain ,
 .Pa domaintable ,
 .Pa genericstable ,
 .Pa mailertable ,
 .Pa uucpdomain ,
 and
 .Pa virtusertable
 maps are always rebuilt if they exist.
 .It Va SENDMAIL_MAP_TYPE
 .Pq Vt str
 Database map type to use when generating map database files using
 .Pa /etc/mail/Makefile .
 The default value is hash.
 The alternative is btree.
 .It Va SENDMAIL_MC
 .Pq Vt str
 The default
 .Xr m4 1
 configuration file to use at install time.
 The value should include the full path to the
 .Pa .mc
 file, e.g.,
 .Pa /etc/mail/myconfig.mc .
 Use with caution as a make install will overwrite any existing
 .Pa /etc/mail/sendmail.cf .
 Note that
 .Va SENDMAIL_CF
 is deprecated.
 .It Va SENDMAIL_SET_USER_ID
 .Pq Vt bool
 If set, install
 .Xr sendmail 8
 as a set-user-ID root binary instead of a set-group-ID binary
 and do not install
 .Pa /etc/mail/submit.{cf,mc} .
 Use of this flag is not recommended and the alternative advice in
 .Pa /etc/mail/README
 should be followed instead if at all possible.
 .It Va SENDMAIL_START_SCRIPT
 .Pq Vt str
 The script used by
 .Pa /etc/mail/Makefile
 to start, stop, and restart
 .Xr sendmail 8 .
 The default value is
 .Pa /etc/rc.sendmail .
 This value should match the
 .Dq Li mta_start_script
 setting in
 .Xr rc.conf 5 .
 .It Va SENDMAIL_SUBMIT_MC
 .Pq Vt str
 The default
 .Xr m4 1
 configuration file for mail submission
 to use at install time.
 The value should include the full path to the
 .Pa .mc
 file, e.g.,
 .Pa /etc/mail/mysubmit.mc .
 Use with caution as a make install will overwrite any existing
 .Pa /etc/mail/submit.cf .
 .It Va TOP_TABLE_SIZE
 .Pq Vt int
 .Xr top 1
 uses a hash table for the user names.
 The size of this hash can be tuned to match the number of local users.
 The table size should be a prime number
 approximately twice as large as the number of lines in
 .Pa /etc/passwd .
 The default number is 20011.
 .It Va WANT_FORCE_OPTIMIZATION_DOWNGRADE
 .Pq Vt int
 Causes the system compiler to be built such that it forces high optimization
 levels to a lower one.
 .Xr cc 1
 .Fl O2
 and above is known to trigger known optimizer bugs at various
 times.
 The value assigned is the highest optimization value used.
 .El
 .Ss "BUILDING DOCUMENTATION"
 The following list provides a name and short description for variables
 that are used when building documentation.
 .Bl -tag -width ".Va PRINTERDEVICE"
 .It Va DOC_LANG
 .Pq Vt str
 The list of languages to build and install when building documentation
 in
 .Pa /usr/doc .
 .It Va PRINTERDEVICE
 .Pq Vt str
 The default format for system documentation in
 .Pa /usr/src/share/doc ,
 depends on your printer.
 This can be set to
 .Dq Li ascii
 for simple printers, or
 .Dq Li ps
 for postscript or graphics printers with a ghostscript
 filter, or both.
 .El
 .Ss "BUILDING PORTS"
 Several make variables can be set that affect the building of ports.
 These variables and their effects are documented in
 .Xr ports 7 ,
 .Pa ${PORTSDIR}/Mk/*
 and the
 .Fx
 Porter's Handbook.
 .Sh FILES
 .Bl -tag -width ".Pa /usr/share/examples/etc/make.conf" -compact
 .It Pa /etc/make.conf
 .It Pa /usr/doc/Makefile
 .It Pa /usr/ports/Makefile
 .It Pa /usr/share/examples/etc/make.conf
 .It Pa /usr/share/mk/sys.mk
 .It Pa /usr/src/Makefile
 .It Pa /usr/src/Makefile.inc1
 .El
 .Sh SEE ALSO
 .Xr cc 1 ,
 .Xr install 1 ,
 .Xr make 1 ,
 .Xr src.conf 5 ,
 .Xr style.Makefile 5 ,
 .Xr environ 7 ,
 .Xr ports 7 ,
 .Xr sendmail 8
 .Sh HISTORY
 The
 .Nm
 file appeared sometime before
 .Fx 4.0 .
 .Sh AUTHORS
 This
 manual page was written by
 .An Mike W. Meyer Aq Mt mwm@mired.org .
 .Sh CAVEATS
 Note, that
 .Ev MAKEOBJDIRPREFIX
 and
 .Ev MAKEOBJDIR
 are environment variables and should not be set in
 .Nm
 or as command line arguments to
 .Xr make 1 ,
 but in make's environment.
 .Sh BUGS
 This manual page may occasionally be out of date with respect to
 the options currently available for use in
 .Nm .
 Please check the
 .Pa /usr/share/examples/etc/make.conf
 file for the latest options which are available.
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 6acef31cc23a..f19af2a5566d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,218 +1,225 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=	adduser \
 	arp \
 	binmiscctl \
 	camdd \
 	cdcontrol \
 	chkgrp \
 	chown \
 	chroot \
 	ckdist \
 	clear_locks \
 	crashinfo \
 	cron \
 	daemon \
 	dconschat \
 	devctl \
 	devinfo \
 	diskinfo \
 	dumpcis \
 	etcupdate \
 	extattr \
 	extattrctl \
 	fifolog \
 	fstyp \
 	fwcontrol \
 	getfmac \
 	getpmac \
 	gstat \
 	i2c \
 	ifmcstat \
 	iostat \
 	iovctl \
 	kldxref \
 	mailwrapper \
 	makefs \
 	memcontrol \
 	mergemaster \
 	mfiutil \
 	mixer \
 	mlxcontrol \
 	mountd \
 	mount_smbfs \
 	mpsutil \
 	mptutil \
 	mtest \
 	newsyslog \
 	nfscbd \
 	nfsd \
 	nfsdumpstate \
 	nfsrevoke \
 	nfsuserd \
 	nmtree \
 	nologin \
 	pciconf \
 	periodic \
 	pnfsdscopymr \
 	pnfsdsfile \
 	pnfsdskill \
 	powerd \
 	prometheus_sysctl_exporter \
 	pstat \
 	pw \
 	pwd_mkdb \
 	pwm \
 	quot \
 	rarpd \
 	rmt \
 	rpcbind \
 	rpc.lockd \
 	rpc.statd \
 	rpc.umntall \
 	rtprio \
 	rwhod \
 	service \
 	services_mkdb \
 	sesutil \
 	setfib \
 	setfmac \
 	setpmac \
 	smbmsg \
 	snapinfo \
 	spi \
 	spray \
 	syslogd \
 	sysrc \
 	tcpdrop \
 	tcpdump \
 	traceroute \
 	trim \
 	trpt \
 	tzsetup \
 	ugidfw \
 	valectl \
 	vigr \
 	vipw \
 	wake \
 	watch \
 	watchdogd \
 	zic \
 	zonectl
 
 # NB: keep these sorted by MK_* knobs
 
 SUBDIR.${MK_ACCT}+=	accton
 SUBDIR.${MK_ACCT}+=	sa
 SUBDIR.${MK_AUDIT}+=	audit
 SUBDIR.${MK_AUDIT}+=	auditd
 .if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_AUDIT}+=	auditdistd
 .endif
 SUBDIR.${MK_AUDIT}+=	auditreduce
 SUBDIR.${MK_AUDIT}+=	praudit
 SUBDIR.${MK_AUTHPF}+=	authpf
 SUBDIR.${MK_AUTOFS}+=	autofs
 SUBDIR.${MK_BLACKLIST}+=	blacklistctl
 SUBDIR.${MK_BLACKLIST}+=	blacklistd
 SUBDIR.${MK_BLUETOOTH}+=	bluetooth
 SUBDIR.${MK_BOOTPARAMD}+=	bootparamd
 SUBDIR.${MK_BSDINSTALL}+=	bsdinstall
 SUBDIR.${MK_BSNMP}+=	bsnmpd
 .if ${MK_CAROOT} != "no"
 SUBDIR.${MK_OPENSSL}+=	certctl
 .endif
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
 SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr
 .if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_EFI}+=	uefisign
 .endif
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread
 SUBDIR.${MK_FLOPPY}+=	fdwrite
 SUBDIR.${MK_FREEBSD_UPDATE}+=	freebsd-update
 SUBDIR.${MK_GSSAPI}+=	gssd
 SUBDIR.${MK_GPIO}+=	gpioctl
 SUBDIR.${MK_INET6}+=	ip6addrctl
 SUBDIR.${MK_INET6}+=	mld6query
 SUBDIR.${MK_INET6}+=	ndp
 SUBDIR.${MK_INET6}+=	rip6query
 SUBDIR.${MK_INET6}+=	route6d
 SUBDIR.${MK_INET6}+=	rrenumd
 SUBDIR.${MK_INET6}+=	rtadvctl
 SUBDIR.${MK_INET6}+=	rtadvd
 SUBDIR.${MK_INET6}+=	rtsold
 SUBDIR.${MK_INET6}+=	traceroute6
 SUBDIR.${MK_INETD}+=	inetd
 SUBDIR.${MK_IPFW}+=	ipfwpcap
 SUBDIR.${MK_ISCSI}+=	ctladm ctld iscsid
 SUBDIR.${MK_JAIL}+=	jail
 SUBDIR.${MK_JAIL}+=	jexec
 SUBDIR.${MK_JAIL}+=	jls
 # XXX MK_SYSCONS
 SUBDIR.${MK_LEGACY_CONSOLE}+=	kbdcontrol
 SUBDIR.${MK_LEGACY_CONSOLE}+=	kbdmap
 SUBDIR.${MK_LEGACY_CONSOLE}+=	moused
 SUBDIR.${MK_LEGACY_CONSOLE}+=	vidcontrol
 SUBDIR.${MK_PPP}+=	pppctl
 SUBDIR.${MK_NS_CACHING}+=	nscd
 SUBDIR.${MK_LPR}+=	lpr
 SUBDIR.${MK_MAN_UTILS}+=	manctl
 SUBDIR.${MK_MLX5TOOL}+=	mlx5tool
 SUBDIR.${MK_NETGRAPH}+=	flowctl
 SUBDIR.${MK_NETGRAPH}+=	ngctl
 SUBDIR.${MK_NETGRAPH}+=	nghook
 SUBDIR.${MK_NIS}+=	rpc.yppasswdd
 SUBDIR.${MK_NIS}+=	rpc.ypupdated
 SUBDIR.${MK_NIS}+=	rpc.ypxfrd
 SUBDIR.${MK_NIS}+=	ypbind
 SUBDIR.${MK_NIS}+=	ypldap
 SUBDIR.${MK_NIS}+=	yp_mkdb
 SUBDIR.${MK_NIS}+=	yppoll
 SUBDIR.${MK_NIS}+=	yppush
 SUBDIR.${MK_NIS}+=	ypserv
 SUBDIR.${MK_NIS}+=	ypset
 SUBDIR.${MK_NTP}+=	ntp
 SUBDIR.${MK_OPENSSL}+=	keyserv
 SUBDIR.${MK_OPENSSL_KTLS}+=	rpc.tlsclntd
 SUBDIR.${MK_OPENSSL_KTLS}+=	rpc.tlsservd
 SUBDIR.${MK_PF}+=	ftp-proxy
 SUBDIR.${MK_PKGBOOTSTRAP}+=	pkg
 SUBDIR.${MK_PMC}+=	pmc pmcannotate pmccontrol pmcstat pmcstudy
 SUBDIR.${MK_PORTSNAP}+=	portsnap
 SUBDIR.${MK_PPP}+=	ppp
 SUBDIR.${MK_QUOTAS}+=	edquota
 SUBDIR.${MK_QUOTAS}+=	quotaon
 SUBDIR.${MK_QUOTAS}+=	repquota
 SUBDIR.${MK_SENDMAIL}+=	editmap
 SUBDIR.${MK_SENDMAIL}+=	mailstats
 SUBDIR.${MK_SENDMAIL}+=	makemap
 SUBDIR.${MK_SENDMAIL}+=	praliases
 SUBDIR.${MK_SENDMAIL}+=	sendmail
 SUBDIR.${MK_TCP_WRAPPERS}+=	tcpdchk
 SUBDIR.${MK_TCP_WRAPPERS}+=	tcpdmatch
 SUBDIR.${MK_TOOLCHAIN}+=	config
 SUBDIR.${MK_TOOLCHAIN}+=	crunch
 SUBDIR.${MK_UNBOUND}+=	unbound
 SUBDIR.${MK_USB}+=	uathload
 SUBDIR.${MK_USB}+=	uhsoctl
 SUBDIR.${MK_USB}+=	usbconfig
 SUBDIR.${MK_USB}+=	usbdump
 SUBDIR.${MK_UTMPX}+=	ac
 SUBDIR.${MK_UTMPX}+=	lastlogin
 SUBDIR.${MK_UTMPX}+=	utx
 SUBDIR.${MK_WIRELESS}+=	wlandebug
 SUBDIR.${MK_WIRELESS}+=	wpa
 
 SUBDIR.${MK_TESTS}+=	tests
 
 .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>
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index f52453c62522..27fa0c37d5cf 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,10 +1,14 @@
 # $FreeBSD$
 
 PROG=	apm
 MAN=	apm.8
 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>