diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 57b0ede67d5..d1c8c0b700b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2161,6 +2161,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/conf/files b/sys/conf/files
index 2a06ff65a9f..e520520f0fd 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -383,6 +383,12 @@ dev/exca/exca.c		optional cbb
 dev/fe/if_fe.c		optional fe
 dev/fe/if_fe_pccard.c	optional fe card
 dev/fe/if_fe_pccard.c	optional fe pccard
+dev/firewire/firewire.c	optional firewire
+dev/firewire/fwohci.c	optional firewire
+dev/firewire/fwohci_pci.c	optional firewire pci
+dev/firewire/fwmem.c	optional firewire
+dev/firewire/if_fwe.c	optional fwe
+dev/firewire/sbp.c	optional sbp
 dev/fxp/if_fxp.c	optional fxp
 dev/gem/if_gem.c	optional gem
 dev/gem/if_gem_pci.c	optional gem pci