Index: release/packages/generate-ucl.sh
===================================================================
--- release/packages/generate-ucl.sh
+++ release/packages/generate-ucl.sh
@@ -71,6 +71,11 @@
 			_descr="Debugging Symbols"
 			pkgdeps="${outname}"
 			;;
+		*_man)
+			outname="${outname%%_man}"
+			_descr="Manual Pages"
+			pkgdeps="${outname}"
+			;;
 		${origname})
 			pkgdeps="runtime"
 			;;
Index: share/mk/bsd.man.mk
===================================================================
--- share/mk/bsd.man.mk
+++ share/mk/bsd.man.mk
@@ -50,7 +50,11 @@
 .error bsd.man.mk cannot be included directly.
 .endif
 
+.if ${MK_MANSPLITPKG} == "no"
 MINSTALL?=	${INSTALL} ${TAG_ARGS} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+.else
+MINSTALL?=	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},man} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+.endif
 
 CATDIR=		${MANDIR:H:S/$/\/cat/}
 CATEXT=		.cat
@@ -226,8 +230,13 @@
 .endif	# ${MK_MANCOMPRESS} == "no"
 .endif
 .for l t in ${_MANLINKS}
+.if ${MK_MANSPLITPKG} == "no"
 	rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
 	    ${INSTALL_MANLINK} ${TAG_ARGS} ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT}
+.else
+	rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
+	    ${INSTALL_MANLINK} ${TAG_ARGS:D${TAG_ARGS},man} ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT}
+.endif
 .endfor
 
 manlint:
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -207,6 +207,7 @@
     LOADER_VERBOSE \
     LOADER_VERIEXEC_PASS_MANIFEST \
     MALLOC_PRODUCTION \
+    MANSPLITPKG \
     OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \