diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 6eaed3fa7f5..0cabacb45dd 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -450,14 +450,6 @@ device		pmspcv
 # Only for legacy Atom C2XXX chipsets.
 device		qat_c2xxx
 
-#
-# SafeNet crypto driver: can be moved to the MI NOTES as soon as
-# it's tested on a big-endian machine
-#
-device		safe		# SafeNet 1141
-options 	SAFE_DEBUG	# enable debugging support: hw.safe.debug
-options 	SAFE_RNDTEST	# enable rndtest support
-
 #
 # VirtIO support
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a4c62dac873..85cd1a307c1 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2635,6 +2635,10 @@ device		hifn		# Hifn 7951, 7781, etc.
 options 	HIFN_DEBUG	# enable debugging support: hw.hifn.debug
 options 	HIFN_RNDTEST	# enable rndtest support
 
+device		safe		# SafeNet 1141
+options 	SAFE_DEBUG	# enable debugging support: hw.safe.debug
+options 	SAFE_RNDTEST	# enable rndtest support
+
 #####################################################################
 
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 6692a9dba10..eee1424b211 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -641,13 +641,6 @@ device		vmd
 #
 # PMC-Sierra SAS/SATA controller
 device		pmspcv
-#
-# SafeNet crypto driver: can be moved to the MI NOTES as soon as
-# it's tested on a big-endian machine
-#
-device		safe		# SafeNet 1141
-options 	SAFE_DEBUG	# enable debugging support: hw.safe.debug
-options 	SAFE_RNDTEST	# enable rndtest support
 
 #
 # glxiic is an I2C driver for the AMD Geode LX CS5536 System Management Bus