diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
--- a/sys/arm/conf/DEFAULTS
+++ b/sys/arm/conf/DEFAULTS
@@ -7,4 +7,4 @@
 
 # Default congestion control algorithm
 options 	CC_CUBIC		# include CUBIC congestion control
-
+options 	INTRNG			# All arm systems use INTRNG these days
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -3,7 +3,6 @@
 # $FreeBSD$
 
 options 	HZ=1000
-options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -3,7 +3,6 @@
 # $FreeBSD$
 
 options 	HZ=1000
-options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
diff --git a/sys/arm64/conf/DEFAULTS b/sys/arm64/conf/DEFAULTS
--- a/sys/arm64/conf/DEFAULTS
+++ b/sys/arm64/conf/DEFAULTS
@@ -17,3 +17,4 @@
 options 	CC_CUBIC		# include CUBIC congestion control
 
 options 	NEW_PCIB
+options 	INTRNG
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -65,7 +65,6 @@
 options 	RACCT			# Resource accounting framework
 options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options 	RCTL			# Resource limits
-options 	INTRNG
 options 	LINUX_BOOT_ABI		# Boot using booti command from U-Boot
 options 	PERTHREAD_SSP		# Per-thread SSP canary
 
diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS
--- a/sys/riscv/conf/DEFAULTS
+++ b/sys/riscv/conf/DEFAULTS
@@ -17,3 +17,4 @@
 options 	CC_CUBIC		# include CUBIC congestion control
 
 options 	NEW_PCIB
+options 	INTRNG
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -77,7 +77,6 @@
 options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options 	RCTL			# Resource limits
 options 	SMP
-options 	INTRNG
 
 # RISC-V SBI console
 device		rcons