Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1363,6 +1363,15 @@
 .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
+.if ${MK_MANDOCDB} != "no"
+_makewhatis=	lib/libsqlite3 \
+		lib/libohash \
+		usr.bin/mandoc
+${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
+.else
+_makewhatis=usr.bin/makewhatis
+.endif
+
 # Rebuild up-to-date libmd for xinstall
 ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
 
@@ -1383,7 +1392,6 @@
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
-    usr.bin/makewhatis \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
@@ -1391,6 +1399,7 @@
     ${_lex} \
     lib/libmd \
     usr.bin/xinstall \
+    ${_makewhatis} \
     ${_gensnmptree} \
     usr.sbin/config \
     ${_crunch} \
@@ -1806,9 +1815,10 @@
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
-lib/libsqlite3__L: lib/libthr__L
 .endif
 
+lib/libsqlite3__L: lib/libthr__L
+
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -126,6 +126,7 @@
     MAIL \
     MAILWRAPPER \
     MAKE \
+    MANDOCDB \
     NDIS \
     NETCAT \
     NETGRAPH \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -5492,7 +5492,6 @@
 OLD_FILES+=usr/sbin/manctl
 OLD_FILES+=usr/share/man/man1/apropos.1.gz
 OLD_FILES+=usr/share/man/man1/catman.1.gz
-OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/man1/man.1.gz
 OLD_FILES+=usr/share/man/man1/manpath.1.gz
 OLD_FILES+=usr/share/man/man1/whatis.1.gz
@@ -5500,9 +5499,16 @@
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
 OLD_FILES+=usr/share/man/man8/manctl.8.gz
+.if ${MK_MANDOCDB} == no
+OLD_FILES+=usr/share/man/man8/makewhatis.8.gz
+OLD_FILES+=usr/share/man/mandoc.db
+OLD_FILES+=usr/share/openssl/man/mandoc.db
+.else
+OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/whatis
 OLD_FILES+=usr/share/openssl/man/whatis
 .endif
+.endif
 
 .if ${MK_NDIS} == no
 OLD_FILES+=usr/sbin/ndiscvt
Index: tools/build/options/WITHOUT_MANDOCDB
===================================================================
--- /dev/null
+++ tools/build/options/WITHOUT_MANDOCDB
@@ -0,0 +1,5 @@
+.\" FreeBSD$
+Use
+.Xr mandoc 1
+version of
+.Xr makewhatis 8 .
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -317,7 +317,9 @@
 
 .if ${MK_MAN_UTILS} != "no"
 SUBDIR+=	catman
+.if ${MK_MANDOCDB} == "no"
 _makewhatis=	makewhatis
+.endif
 _man=		man
 .endif
 
Index: usr.bin/man/Makefile
===================================================================
--- usr.bin/man/Makefile
+++ usr.bin/man/Makefile
@@ -1,11 +1,17 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SCRIPTS= man.sh
-LINKS=	${BINDIR}/man ${BINDIR}/apropos \
-	${BINDIR}/man ${BINDIR}/manpath \
-	${BINDIR}/man ${BINDIR}/whatis
+LINKS=	${BINDIR}/man ${BINDIR}/manpath
 
-MAN=	man.1 manpath.1 apropos.1 man.conf.5
+MAN=	man.1 manpath.1 man.conf.5
+
+.if ${MK_MANDOCDB} == no
+LINKS+=	${BINDIR}/man ${BINDIR}/apropos \
+	${BINDIR}/man ${BINDIR}/whatis
+MAN+=	apropos.1
 MLINKS=	apropos.1 whatis.1
+.endif
 
 .include <bsd.prog.mk>
Index: usr.bin/mandoc/Makefile
===================================================================
--- usr.bin/mandoc/Makefile
+++ usr.bin/mandoc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 .PATH: ${MDOCMLDIR}
 
@@ -7,7 +9,14 @@
 FILES=	example.style.css style.css
 FILESDIR=	${SHAREDIR}/mdocml
 MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7
-MLINKS= mandoc.1 mdocml.1
+.if ${MK_MANDOCDB} != no
+MAN+=	apropos.1 makewhatis.8
+MLINKS=	mandoc.1 mdocml.1 \
+	apropos.1 whatis.1
+LINKS=	${BINDIR}/mandoc ${BINDIR}/whatis \
+	${BINDIR}/mandoc ${BINDIR}/makewhatis \
+	${BINDIR}/mandoc ${BINDIR}/apropos
+.endif
 
 LIBMAN_SRCS=	man.c \
 		man_hash.c \