diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 64307c9ec1d6..03712f8a4aa3 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -15,7 +15,6 @@ nooptions	MAXCPU		# value is set in machine/param.h
 # Devices in sys/conf/NOTES for which no such hardware exists on arm,
 # or the drivers don't compile...
 
-nodevice	fdc
 nodevice	sym
 
 nodevice	ccr
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index 63eba40e9a48..b206b0447987 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -205,9 +205,6 @@ options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
 # bring in camified MMC too
 options		MMCCAM
 
-# No support for floppies on arm64
-nodevice	fdc
-
 # arm64 doesn't support inb/outb, so disable chipset probing which needs it
 nooptions 	PPC_PROBE_CHIPSET
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 6be3f2aa28c0..6072807f7823 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1697,32 +1697,6 @@ hint.ata.1.at="isa"
 hint.ata.1.port="0x170"
 hint.ata.1.irq="15"
 
-#
-# Standard floppy disk controllers and floppy tapes, supports
-# the Y-E DATA External FDD (PC Card)
-#
-device		fdc
-hint.fdc.0.at="isa"
-hint.fdc.0.port="0x3F0"
-hint.fdc.0.irq="6"
-hint.fdc.0.drq="2"
-#
-# FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
-# gotta turn it actually on by setting the variable fd_debug with DDB,
-# however.
-options 	FDC_DEBUG
-#
-# Activate this line if you happen to have an Insight floppy tape.
-# Probing them proved to be dangerous for people with floppy disks only,
-# so it's "hidden" behind a flag:
-#hint.fdc.0.flags="1"
-
-# Specify floppy devices
-hint.fd.0.at="fdc0"
-hint.fd.0.drive="0"
-hint.fd.1.at="fdc0"
-hint.fd.1.drive="1"
-
 #
 # uart: newbusified driver for serial interfaces.  It consolidates the sio(4),
 #	sab(4) and zs(4) drivers.
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 209be406490b..3f63dd03f1ba 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -76,7 +76,6 @@ nodevice	bktr
 nodevice	ccr
 nodevice	cxgbe		# XXX: builds on powerpc64 only.
 nodevice	cxgbev
-nodevice	fdc
 nodevice	mpr		# no 64-bit atomics
 nodevice	mps		# no 64-bit atomics
 nodevice	ppc
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index f3a8ca2ae919..28e2030df536 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -124,7 +124,6 @@ options 	SC_NO_SYSMOUSE
 # Devices we don't want to deal with
 
 nodevice	bktr
-nodevice	fdc
 nodevice	ppc
 nodevice	snd_ad1816
 nodevice	snd_als4000
@@ -155,7 +154,6 @@ nodevice	snd_uaudio
 #####################################################################
 # Options we don't want to deal with
 
-nooption	FDC_DEBUG
 nooption	COMPAT_FREEBSD4
 nooption	SC_RENDER_DEBUG
 nooption	SC_DEBUG_LEVEL
diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES
index 23c4db9e5f2a..8894fecfefe1 100644
--- a/sys/x86/conf/NOTES
+++ b/sys/x86/conf/NOTES
@@ -78,3 +78,28 @@ device		snake_saver
 device		star_saver
 device		warp_saver
 
+#
+# Standard floppy disk controllers and floppy tapes, supports
+# the Y-E DATA External FDD (PC Card)
+#
+device		fdc
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+#
+# FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
+# gotta turn it actually on by setting the variable fd_debug with DDB,
+# however.
+options 	FDC_DEBUG
+#
+# Activate this line if you happen to have an Insight floppy tape.
+# Probing them proved to be dangerous for people with floppy disks only,
+# so it's "hidden" behind a flag:
+#hint.fdc.0.flags="1"
+
+# Specify floppy devices
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.fd.1.at="fdc0"
+hint.fd.1.drive="1"