Index: stable/11/UPDATING
===================================================================
--- stable/11/UPDATING
+++ stable/11/UPDATING
@@ -16,6 +16,12 @@
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20180108:
+	lint(1) binaries and library are no longer built by default.  To
+	enable building them, define WITH_LINT in src.conf.  If you are using
+	a FreeBSD 12 or later system to build 11-stable, you may need to
+	install a lint(1) binary to use WITH_LINT.
+
 20171003:
 	When building multiple kernels using KERNCONF, non-existent KERNCONF
 	files will produce an error and buildkernel will fail. Previously
Index: stable/11/share/man/man5/src.conf.5
===================================================================
--- stable/11/share/man/man5/src.conf.5
+++ stable/11/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd September 7, 2017
+.Dd January 8, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -927,6 +927,8 @@
 .Nm libthr
 (1:1 threading)
 library.
+.It Va WITH_LINT
+Set to build the lint binaries and library.
 .It Va WITHOUT_LLD
 Set to not build LLVM's lld linker.
 .Pp
Index: stable/11/share/mk/src.opts.mk
===================================================================
--- stable/11/share/mk/src.opts.mk
+++ stable/11/share/mk/src.opts.mk
@@ -187,6 +187,7 @@
     EISA \
     HESIOD \
     LIBSOFT \
+    LINT \
     NAND \
     OFED \
     OPENLDAP \
Index: stable/11/usr.bin/Makefile
===================================================================
--- stable/11/usr.bin/Makefile
+++ stable/11/usr.bin/Makefile
@@ -286,7 +286,7 @@
 SUBDIR.${MK_TOOLCHAIN}+=	rpcgen
 SUBDIR.${MK_TOOLCHAIN}+=	unifdef
 SUBDIR.${MK_TOOLCHAIN}+=	size
-.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
+.if ${MK_LINT} != "no" && ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
 SUBDIR.${MK_TOOLCHAIN}+=	xlint
 .endif
 SUBDIR.${MK_TOOLCHAIN}+=	xstr