diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 4351a2b1558e..786381493d65 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3482,6 +3482,10 @@ OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 .endif
 
+.if ${MK_PKGBOOTSTRAP} == no
+OLD_FILES+=usr/sbin/pkg
+.endif
+
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
diff --git a/tools/build/options/WITHOUT_PKGBOOSTRAP b/tools/build/options/WITHOUT_PKGBOOSTRAP
new file mode 100644
index 000000000000..8d4ae45ba5b4
--- /dev/null
+++ b/tools/build/options/WITHOUT_PKGBOOSTRAP
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr pkg
+bootstrap tool
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index ded1725cb52d..69dc01f0bef2 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -259,9 +259,12 @@ SUBDIR+=	keyserv
 SUBDIR+=	ftp-proxy
 .endif
 
+.if ${PK_PKGBOOTSTRAP} != "no"
+SUBDIR+=	pkg
+.endif
+
 .if ${MK_PKGTOOLS} != "no"
 SUBDIR+=	pkg_install
-SUBDIR+=	pkg
 .endif
 
 # XXX MK_TOOLCHAIN?