diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 60cb04a5e979..cf822b3a9666 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -1,17 +1,14 @@
 #
-# DEFAULTS -- Default kernel configuration file for FreeBSD/i386
+# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
 # $FreeBSD$
 
 # Not yet, this would break all existing configs
-#machine		i386
+#machine		amd64
 
 # Bus support.
 device		isa
 
-# Floating point support.
-device		npx
-
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index fb4c26386560..9b99994d594a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -79,9 +79,8 @@ options 	SMP			# Symmetric MultiProcessor Kernel
 # Linux 32-bit ABI support
 options 	LINPROCFS		# Cannot be a module yet.
 
-# Bus support.  Do not remove isa, even if you have no isa slots
+# Bus support.
 device		acpi
-device		isa
 device		pci
 
 # Floppy drives
@@ -231,8 +230,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
-device		io		# I/O device
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP