diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ab1e25ea26ff..a9e9d96a89c4 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2124,6 +2124,13 @@ options 	USB_DEBUG
 options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	UKBD_DFLT_KEYMAP=it.iso
 
+#####################################################################
+# Firewire support
+
+device		firewire	# Firewire bus code
+device		sbp		# SCSI over Firewire (Requires scbus and da)
+device		fwe		# Ethernet over Firewire (non-standard!)
+
 #####################################################################
 # crypto subsystem
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c4a3a7fb95f5..8fc3cab12093 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -961,13 +961,6 @@ device		"i4bcapi"
 #
 #---------------------------------------------------------------------------
 
-#####################################################################
-# Firewire support
-
-device		firewire	# Firewire bus code
-device		sbp		# SCSI over Firewire (Requires scbus and da)
-device		fwe		# Ethernet over Firewire (non-standard!)
-
 #
 # Set the number of PV entries per process.  Increasing this can
 # stop panics related to heavy use of shared memory. However, that can
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b9a7a3194432..52c7a288999a 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -37,6 +37,7 @@ SUBDIR=	3dfx \
 	dummynet \
 	fdc \
 	fdescfs \
+	firewire \
 	fxp \
 	gx \
 	hifn \
@@ -161,7 +162,6 @@ SUBDIR+=aic \
 	em \
 	ep \
 	fe \
-	firewire \
 	fpu \
 	gnufpu \
 	hea \