diff --git a/libexec/Makefile b/libexec/Makefile
index 7d1c1f8ddae4..c8b5386678c4 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -28,7 +28,6 @@ SUBDIR=	${_atf} \
 	${_rtld-elf} \
 	save-entropy \
 	${_smrsh} \
-	talkd \
 	tcpd \
 	${_telnetd} \
 	${_tests} \
@@ -81,6 +80,10 @@ _mail.local=	mail.local
 _smrsh=		smrsh
 .endif
 
+.if ${MK_TALK} != "no"
+SUBDIR+=	talkd
+.endif
+
 .if ${MK_TELNET} != "no"
 _telnetd=	telnetd
 .endif
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index fc29acee1711..126e7868c6fb 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -144,6 +144,7 @@ __DEFAULT_YES_OPTIONS = \
     SYSCALL_COMPAT \
     SYSCONS \
     SYSINSTALL \
+    TALK \
     TCSH \
     TELNET \
     TESTS \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ceb81c9b34fc..1f326b4c829d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4073,6 +4073,13 @@ OLD_DIRS+=usr/share/doc/pjdfstest
 # to be filled in
 #.endif
 
+.if ${MK_TALK} == no
+OLD_FILES+=usr/bin/talk
+OLD_FILES+=usr/libexec/ntalkd
+OLD_FILES+=usr/share/man/man1/talk.1.gz
+OLD_FILES+=usr/share/man/man8/talkd.8.gz
+.endif
+
 .if ${MK_TCSH} == no
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
diff --git a/tools/build/options/WITHOUT_TALK b/tools/build/options/WITHOUT_TALK
new file mode 100644
index 000000000000..33d41675000b
--- /dev/null
+++ b/tools/build/options/WITHOUT_TALK
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr talk 1
+and
+.Xr talkd 8 .
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index fb12ef8f0dc2..fbe87bd296d8 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -162,7 +162,6 @@ SUBDIR=	${_addr2line} \
 	systat \
 	tabs \
 	tail \
-	talk \
 	tar \
 	tcopy \
 	tee \
@@ -348,6 +347,10 @@ SUBDIR+=	rwho
 SUBDIR+=	vacation
 .endif
 
+.if ${MK_TALK} != "no"
+SUBDIR+=	talk
+.endif
+
 .if ${MK_TELNET} != "no"
 SUBDIR+=	telnet
 .endif