diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index ba3955a698df..23d5aedc0cf5 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -166,6 +166,7 @@ __DEFAULT_YES_OPTIONS = \
     UNBOUND \
     USB \
     UTMPX \
+    VI \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
     ZFS \
diff --git a/tools/build/options/WITHOUT_VI b/tools/build/options/WITHOUT_VI
new file mode 100644
index 000000000000..7455c21b6cf6
--- /dev/null
+++ b/tools/build/options/WITHOUT_VI
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build and install vi, view, ex and related programs.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 7403aa545af8..ef9381b27107 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -182,7 +182,6 @@ SUBDIR=	alias \
 	unvis \
 	uudecode \
 	uuencode \
-	vi \
 	vis \
 	vmstat \
 	w \
@@ -361,6 +360,10 @@ SUBDIR+=	xstr
 SUBDIR+=	yacc
 .endif
 
+.if ${MK_VI} != "no"
+SUBDIR+=	vi
+.endif
+
 .if ${MK_USB} != "no"
 SUBDIR+=	usbhidaction
 SUBDIR+=	usbhidctl