diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 1fb52b3..e942c1a 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -5,10 +5,10 @@
 
 machine		amd64
 
-# Bus support.
+# Bus support
 device		isa
 
-# Pseudo devices.
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
 
diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
index 591a0a1..5e1512f 100644
--- a/sys/arm/conf/DEFAULTS
+++ b/sys/arm/conf/DEFAULTS
@@ -5,7 +5,9 @@
 
 machine 	arm
 
-device		mem
+# Pseudo devices
+device		mem		# Memory and kernel memory devices
 
+# Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 32e77e4..b780472 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -5,14 +5,14 @@
 
 machine		i386
 
-# Bus support.
+# Bus support
 device		isa
 options 	ISAPNP
 
-# Floating point support.
+# Floating point support
 device		npx
 
-# Pseudo devices.
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
 
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index 2cb2330..88119b0 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -5,16 +5,17 @@
 
 machine		ia64
 
-# Bus support.
+# Bus support
 device		acpi		# ACPI support
 
-# Pseudo devices.
-device		io		# I/O & EFI runtime device
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
+device		io		# I/O & EFI runtime device
 
 # UART chips on this platform
 device		uart_ns8250
 
+# Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_GPT
 options 	GEOM_PART_MBR
diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS
index dc480ce..59e4442 100644
--- a/sys/mips/conf/DEFAULTS
+++ b/sys/mips/conf/DEFAULTS
@@ -5,9 +5,12 @@
 
 machine 	mips
 
-device		mem
+# Pseudo devices
+device		mem		# Memory and kernel memory devices
 
+# UART chips on this platform
 device		uart_ns8250
 
+# Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index f30501e..527b861 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -6,14 +6,14 @@
 machine		pc98 i386
 options 	PC98
 
-# Bus support.
+# Bus support
 device		isa
 options 	ISAPNP
 
-# Floating point support.
+# Floating point support
 device		npx
 
-# Pseudo devices.
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
 
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 658c221..195a78f 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -3,12 +3,15 @@
 #
 # $FreeBSD$
 
-# Pseudo devices.
+machine		powerpc powerpc
+
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 
 # UART chips on this platform
 device		uart_ns8250
 device		uart_z8530
 
+# Default partitioning schemes
 options 	GEOM_PART_APM
 options 	GEOM_PART_MBR
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 891d9aa..36f3d66 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -21,8 +21,6 @@
 cpu		AIM
 ident		GENERIC
 
-machine		powerpc	powerpc
-
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 # Platform support
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index 38b2408..2e60c94 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -5,7 +5,7 @@
 
 machine		sparc64
 
-# Pseudo devices.
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 
 # UART chips on this platform
@@ -17,5 +17,5 @@ device		uart_z8530
 options 	GEOM_PART_BSD
 options 	GEOM_PART_VTOC8
 
-# Let sunkbd emulate an AT keyboard by default.
+# Let sunkbd emulate an AT keyboard by default
 options 	SUNKBD_EMULATE_ATKBD
diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS
index 87a55ec..4c21bc9 100644
--- a/sys/sun4v/conf/DEFAULTS
+++ b/sys/sun4v/conf/DEFAULTS
@@ -5,7 +5,7 @@
 
 machine		sun4v sparc64
 
-# Pseudo devices.
+# Pseudo devices
 device		mem		# Memory and kernel memory devices
 
 # Default partitioning schemes