--- tools/build/mk/OptionalObsoleteFiles.inc.orig
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -2255,16 +2255,19 @@
 OLD_DIRS+=usr/share/examples/BSD_daemon
 OLD_DIRS+=usr/share/examples/FreeBSD_version
 OLD_DIRS+=usr/share/examples/IPv6
+OLD_DIRS+=usr/share/examples/bhyve
 OLD_DIRS+=usr/share/examples/bootforth
 OLD_DIRS+=usr/share/examples/bsdconfig
 OLD_DIRS+=usr/share/examples/csh
 OLD_DIRS+=usr/share/examples/diskless
 OLD_DIRS+=usr/share/examples/dma
 OLD_DIRS+=usr/share/examples/drivers
+OLD_DIRS+=usr/share/examples/dwatch
 OLD_DIRS+=usr/share/examples/etc
 OLD_DIRS+=usr/share/examples/etc/defaults
 OLD_DIRS+=usr/share/examples/find_interface
 OLD_DIRS+=usr/share/examples/hast
+OLD_DIRS+=usr/share/examples/hostapd
 OLD_DIRS+=usr/share/examples/ibcs2
 OLD_DIRS+=usr/share/examples/indent
 OLD_DIRS+=usr/share/examples/ipfw
@@ -7136,6 +7139,7 @@
 .endif
 
 .if ${MK_SENDMAIL} == no
+OLD_FILES+=etc/mtree/BSD.sendmail.dist
 OLD_FILES+=etc/newsyslog.conf.d/sendmail.conf
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
@@ -7374,6 +7378,7 @@
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
+OLD_DIRS+=var/spool/clientmqueue
 .endif
 
 .if ${MK_SHAREDOCS} == no