diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 7b8f11c2af16..343b4f820161 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -45,6 +45,7 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     EISA \
+    EXTRA_TCP_STACKS \
     NAND \
     OFED
 
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 70abb10c2441..8c5a71317dbb 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -23,6 +23,10 @@ MKMODULESENV+=	CONF_CFLAGS="${CONF_CFLAGS}"
 MKMODULESENV+=	WITH_CTF="${WITH_CTF}"
 .endif
 
+.if defined(WITH_EXTRA_TCP_STACKS)
+MKMODULESENV+=	WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}"
+.endif
+
 # Allow overriding the kernel debug directory, so kernel and user debug may be
 # installed in different directories. Setting it to "" restores the historical
 # behavior of installing debug files in the kernel directory.
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 745d414825eb..426d12f54e3a 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -353,7 +353,7 @@ SUBDIR=	\
 	${_syscons} \
 	sysvipc \
 	${_ti} \
-	tcp/fastpath \
+	${_tcp_fastpath} \
 	tests/framework \
 	tests/callout_test \
 	tl \
@@ -436,6 +436,10 @@ _random_other=	random_other
 SUBDIR+=	cuse
 .endif
 
+.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
+_tcp_fastpath=	tcp/fastpath
+.endif
+
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp