diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 907402eff79e..1cba28fa07d0 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4130,6 +4130,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NFS_SERVER} == no
+OLD_FILES+=etc/rc.d/mountd
 OLD_FILES+=etc/rc.d/nfscbd
 OLD_FILES+=etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsuserd
@@ -4139,7 +4140,10 @@ OLD_FILES+=usr/sbin/nfsdumpstate
 OLD_FILES+=usr/sbin/nfsrevoke
 OLD_FILES+=usr/sbin/nfsuserd
 OLD_FILES+=usr/share/man/man4/nfsv4.4.gz
+OLD_FILES+=usr/share/man/man5/exports.5.gz
+OLD_FILES+=usr/share/man/man5/netgroup.5.gz
 OLD_FILES+=usr/share/man/man5/stablerestart.5.gz
+OLD_FILES+=usr/share/man/man8/mountd.8.gz
 OLD_FILES+=usr/share/man/man8/nfscbd.8.gz
 OLD_FILES+=usr/share/man/man8/nfsd.8.gz
 OLD_FILES+=usr/share/man/man8/nfsdumpstate.8.gz
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 7cf8a5f616a2..67b77e1728d1 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -38,7 +38,6 @@ SUBDIR=	adduser \
 	mfiutil \
 	mixer \
 	mlxcontrol \
-	mountd \
 	mptutil \
 	mtest \
 	${_mtree} \
@@ -237,6 +236,7 @@ SUBDIR+=	nghook
 .endif
 
 .if ${MK_NFS_SERVER} != "no"
+SUBDIR+=	mountd
 SUBDIR+=	nfscbd
 SUBDIR+=	nfsd
 SUBDIR+=	nfsdumpstate