diff --git a/libexec/Makefile b/libexec/Makefile
index 5bf4f2d2a78..4c74894f605 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
-SUBDIR=	atrun comsat fingerd ftpd getNAME getty lfs_cleanerd \
+SUBDIR=	atrun bootpd bootpgw comsat fingerd ftpd getNAME getty lfs_cleanerd \
 	mail.local makekey rexecd rlogind rpc.rstatd rpc.rusersd \
 	rpc.rwalld rshd talkd telnetd tftpd uucpd
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 25ade545aa7..385f53ff5ba 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -3,7 +3,7 @@
 # XXX MISSING:		mkproto
 # XXX MISSING SOURCES:	quot
 # XXX TEMP. BROKEN:	iostat
-SUBDIR=	ac accton amd arp bootpd bootpef bootpgw bootptest chown chroot \
+SUBDIR=	ac accton amd arp chown chroot \
 	cron crunch dbsym dev_mkdb diskpart edquota fdformat fdwrite \
 	inetd kbdcontrol kgmon kvm_mkdb lpr lptcontrol \
 	manctl mtree mrouted named nslookup pkg_install portmap pstat \