diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2662,6 +2662,7 @@
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/rc.d/ipfw
+OLD_FILES+=etc/rc.d/natd
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
@@ -5575,6 +5576,7 @@
 .endif
 
 .if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/nisdomain
 OLD_FILES+=etc/rc.d/ypbind
 OLD_FILES+=etc/rc.d/ypldap
 OLD_FILES+=etc/rc.d/yppasswdd
@@ -6654,6 +6656,9 @@
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
+OLD_FILES+=etc/rc.d/pf
+OLD_FILES+=etc/rc.d/pflog
+OLD_FILES+=etc/rc.d/pfsync
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
@@ -6843,6 +6848,7 @@
 .if ${MK_PPP} == no
 OLD_FILES+=etc/newsyslog.conf.d/ppp.conf
 OLD_FILES+=etc/ppp/ppp.conf
+OLD_FILES+=etc/rc.d/ppp
 OLD_FILES+=etc/syslog.d/ppp.conf
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
@@ -8997,6 +9003,9 @@
 OLD_FILES+=etc/rc.d/zfsbe
 OLD_FILES+=etc/rc.d/zfsd
 OLD_FILES+=etc/rc.d/zfskeys
+OLD_FILES+=etc/rc.d/zpool
+OLD_FILES+=etc/rc.d/zpoolreguid
+OLD_FILES+=etc/rc.d/zpoolupgrade
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs