Index: include/rpcsvc/Makefile
===================================================================
--- include/rpcsvc/Makefile
+++ include/rpcsvc/Makefile
@@ -1,19 +1,24 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .SUFFIXES: .x
 
 RPCCOM=	RPCGEN_CPP=${CPP:Q} rpcgen -C
 
 HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \
-      rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \
-      ypxfrd.h ypupdate_prot.h nis.h nis_cache.h nis_callback.h \
-      bootparam_prot.h crypt.h
+      rquota.h rstat.h rwall.h sm_inter.h spray.h bootparam_prot.h crypt.h
 XFILES= bootparam_prot.x key_prot.x klm_prot.x mount.x nfs_prot.x nlm_prot.x \
-      rex.x rnusers.x rquota.x rstat.x rwall.x sm_inter.x spray.x \
-      yppasswd.x yp.x ypxfrd.x ypupdate_prot.x nis.x nis_cache.x nis_object.x \
-      nis_callback.x crypt.x
+      rex.x rnusers.x rquota.x rstat.x rwall.x sm_inter.x spray.x crypt.x
+
+.if ${MK_NIS} != "no"
+HDRS+=	yppasswd.h yp.h ypxfrd.h ypupdate_prot.h nis.h nis_cache.h \
+	nis_callback.h
+XFILES+=yppasswd.x yp.x ypxfrd.x ypupdate_prot.x nis.x nis_cache.x \
+	nis_object.x nis_callback.x
 HFILES= yp_prot.h ypclnt.h nis_db.h nis_tags.h nislib.h
+.endif
 
 CLEANFILES+= ${HDRS}
 
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -6683,6 +6683,26 @@
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
+OLD_FILES+=usr/include/rpcsvc/nis.h
+OLD_FILES+=usr/include/rpcsvc/nis.x
+OLD_FILES+=usr/include/rpcsvc/nis_cache.h
+OLD_FILES+=usr/include/rpcsvc/nis_cache.x
+OLD_FILES+=usr/include/rpcsvc/nis_callback.h
+OLD_FILES+=usr/include/rpcsvc/nis_callback.x
+OLD_FILES+=usr/include/rpcsvc/nis_db.h
+OLD_FILES+=usr/include/rpcsvc/nis_object.x
+OLD_FILES+=usr/include/rpcsvc/nis_tags.h
+OLD_FILES+=usr/include/rpcsvc/nislib.h
+OLD_FILES+=usr/include/rpcsvc/yp.h
+OLD_FILES+=usr/include/rpcsvc/yp.x
+OLD_FILES+=usr/include/rpcsvc/yp_prot.h
+OLD_FILES+=usr/include/rpcsvc/ypclnt.h
+OLD_FILES+=usr/include/rpcsvc/yppasswd.h
+OLD_FILES+=usr/include/rpcsvc/yppasswd.x
+OLD_FILES+=usr/include/rpcsvc/ypupdate_prot.h
+OLD_FILES+=usr/include/rpcsvc/ypupdate_prot.x
+OLD_FILES+=usr/include/rpcsvc/ypxfrd.h
+OLD_FILES+=usr/include/rpcsvc/ypxfrd.x
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so