Index: sys/amd64/conf/DEFAULTS
===================================================================
--- sys/amd64/conf/DEFAULTS
+++ sys/amd64/conf/DEFAULTS
@@ -21,4 +21,7 @@
 options 	GEOM_PART_MBR
 options 	GEOM_PART_GPT
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
 options 	NEW_PCIB
Index: sys/amd64/conf/GENERIC
===================================================================
--- sys/amd64/conf/GENERIC
+++ sys/amd64/conf/GENERIC
@@ -30,8 +30,6 @@
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options		ROUTE_MPATH		# Multipath routing support
 options		FIB_ALGO		# Modular fib lookups
Index: sys/amd64/conf/MINIMAL
===================================================================
--- sys/amd64/conf/MINIMAL
+++ sys/amd64/conf/MINIMAL
@@ -43,8 +43,6 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP_SUPPORT		# Allow kldload of SCTP
 options 	FFS			# Berkeley Fast Filesystem
Index: sys/arm/conf/DEFAULTS
===================================================================
--- sys/arm/conf/DEFAULTS
+++ sys/arm/conf/DEFAULTS
@@ -5,3 +5,6 @@
 
 device		mem
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
Index: sys/arm64/conf/DEFAULTS
===================================================================
--- sys/arm64/conf/DEFAULTS
+++ sys/arm64/conf/DEFAULTS
@@ -13,4 +13,7 @@
 options 	GEOM_PART_MBR
 options 	GEOM_PART_GPT
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
 options 	NEW_PCIB
Index: sys/i386/conf/DEFAULTS
===================================================================
--- sys/i386/conf/DEFAULTS
+++ sys/i386/conf/DEFAULTS
@@ -22,6 +22,9 @@
 options 	GEOM_PART_MBR
 options 	GEOM_PART_GPT
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
 # enable support for native hardware
 device		atpic
 
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -31,8 +31,6 @@
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options		ROUTE_MPATH		# Multipath routing support
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: sys/i386/conf/MINIMAL
===================================================================
--- sys/i386/conf/MINIMAL
+++ sys/i386/conf/MINIMAL
@@ -44,8 +44,6 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP_SUPPORT		# Allow kldload of SCTP
 options 	FFS			# Berkeley Fast Filesystem
Index: sys/mips/conf/DEFAULTS
===================================================================
--- sys/mips/conf/DEFAULTS
+++ sys/mips/conf/DEFAULTS
@@ -9,3 +9,6 @@
 
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
+
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
Index: sys/netinet/cc/cc.c
===================================================================
--- sys/netinet/cc/cc.c
+++ sys/netinet/cc/cc.c
@@ -77,6 +77,13 @@
 #include <netinet/cc/cc.h>
 #include <netinet/cc/cc_module.h>
 
+/*
+ * Have a sane default if no CC_DEFAULT is specified in the kernel config file.
+ */
+#ifndef CC_DEFAULT
+#define CC_DEFAULT "newreno"
+#endif
+
 MALLOC_DEFINE(M_CC_MEM, "CC Mem", "Congestion Control State memory");
 
 /*
Index: sys/powerpc/conf/DEFAULTS
===================================================================
--- sys/powerpc/conf/DEFAULTS
+++ sys/powerpc/conf/DEFAULTS
@@ -12,4 +12,7 @@
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
 options         NEW_PCIB
Index: sys/powerpc/conf/GENERIC
===================================================================
--- sys/powerpc/conf/GENERIC
+++ sys/powerpc/conf/GENERIC
@@ -38,8 +38,6 @@
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_RFC7413		# TCP Fast Open
Index: sys/riscv/conf/DEFAULTS
===================================================================
--- sys/riscv/conf/DEFAULTS
+++ sys/riscv/conf/DEFAULTS
@@ -12,4 +12,7 @@
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
 
+# Default congestion control algorithm
+options		CC_NEWRENO		# include newreno congestion control
+
 options 	NEW_PCIB
Index: sys/riscv/conf/GENERIC
===================================================================
--- sys/riscv/conf/GENERIC
+++ sys/riscv/conf/GENERIC
@@ -29,8 +29,6 @@
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		CC_NEWRENO		# include newreno congestion control
-options		CC_DEFAULT=\"newreno\"	# define our default CC module it should be compiled in.
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options		ROUTE_MPATH		# Multipath routing support