diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 0feec79b000..27534185eda 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -86,6 +86,9 @@ SYSTEM_DEP+= $S/conf/ldscript.$M
 # them.
 
 MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
+.if (${KERN_IDENT} == LINT)
+MKMODULESENV+=	ALL_MODULES=LINT
+.endif
 .if defined(MODULES_OVERRIDE)
 MKMODULESENV+=	MODULES_OVERRIDE="${MODULES_OVERRIDE}"
 .endif
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 5a0e063b715..05361512ba1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -168,7 +168,7 @@ SUBDIR+=linux \
 SUBDIR+=ext2fs
 .endif
 
-.if defined(MODULES_OVERRIDE)
+.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .endif