diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index c65fd6542f4..a5363157a61 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -53,9 +53,9 @@ options 	SYSVSEM			#SYSV-style semaphores
 options 	P1003_1B		#Posix P1003_1B real-time extensions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
-options		AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
                                         # output.  Adds ~215k to driver.
 
 # Debugging for use in -current
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 02b5f17d014..294b271e087 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -177,7 +177,7 @@ options 	WITNESS_SKIPSPIN
 #  debug.mutex.prof.collisions - number of hash collisions
 #  debug.mutex.prof.stats - profiling statistics
 #
-options		MUTEX_PROFILING
+options 	MUTEX_PROFILING
 
 
 #####################################################################
@@ -628,7 +628,7 @@ options 	PORTALFS		#Portal filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	SMBFS			#SMB/CIFS filesystem
-options		UDF			#Universal Disk Format
+options 	UDF			#Universal Disk Format
 options 	UMAPFS			#UID map filesystem
 options 	UNIONFS			#Union filesystem
 # options 	NODEVFS			#disable devices filesystem
@@ -1228,14 +1228,14 @@ options 	AHC_DUMP_EEPROM
 options 	AHC_TMODE_ENABLE
 
 # Compile in aic79xx debugging code.
-options		AHD_DEBUG
+options 	AHD_DEBUG
 
 # Aic79xx driver debugging options.   
 # See the ahd(4) manpage
-options		AHD_DEBUG_OPTS=0xFFFFFFFF
+options 	AHD_DEBUG_OPTS=0xFFFFFFFF
 
 # Print human-readable register definitions when debugging
-options		AHD_REG_PRETTY_PRINT
+options 	AHD_REG_PRETTY_PRINT
 
 # The adw driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set.
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index c65fd6542f4..a5363157a61 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -53,9 +53,9 @@ options 	SYSVSEM			#SYSV-style semaphores
 options 	P1003_1B		#Posix P1003_1B real-time extensions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
-options		AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
                                         # output.  Adds ~215k to driver.
 
 # Debugging for use in -current
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 60e4b3ba01c..aef286b1dd5 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -210,7 +210,7 @@ options 	PERFMON
 # Only the "dc" "fxp" and "sis" devices support this mode of operation at
 # the time of this writing.
 
-options		DEVICE_POLLING
+options 	DEVICE_POLLING
 
 
 #####################################################################
@@ -940,7 +940,7 @@ device		streams		# STREAMS network driver (required for svr4).
 # switches less expensive.  You should only disable this feature as a
 # temporary workaround if you are having problems with it enabled.
 #
-#options	DISABLE_PG_G
+#options 	DISABLE_PG_G
 
 # KSTACK_PAGES is the number of memory pages to assign to the kernel
 # stack of each thread.
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 9dfbb4a5cb3..5980d2171c4 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -51,7 +51,7 @@ options 	KTRACE			#ktrace(1) syscall trace support
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
-options		P1003_1B		#Posix P1003_1B real-time extentions
+options 	P1003_1B		#Posix P1003_1B real-time extentions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 
 # SMP
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 84dd5fbd346..1b96b085ea3 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -33,7 +33,7 @@ maxusers	32
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	NO_CPU_COPTFLAGS=true	#Ignore any x86 CPUTYPE
 
-options		SKI			#Support for HP simulator
+options 	SKI			#Support for HP simulator
 options 	INET			#InterNETworking
 #options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
@@ -51,9 +51,9 @@ options 	KTRACE			#ktrace(1) syscall trace support
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
-options		P1003_1B		#Posix P1003_1B real-time extentions
+options 	P1003_1B		#Posix P1003_1B real-time extentions
 options 	_KPOSIX_PRIORITY_SCHEDULING
-options		CONSPEED=115200
+options 	CONSPEED=115200
 options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to
 
 # Debugging for use in -current
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 1554fa275a3..6ad92e4387c 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -30,19 +30,19 @@ maxusers	0
 makeoptions	WERROR=-Wno-error	#XXX: We don't want -Werror just now
 
 options 	FFS
-options		NFSCLIENT
-options		NFS_ROOT
-options		BOOTP
-options		BOOTP_NFSROOT
+options 	NFSCLIENT
+options 	NFS_ROOT
+options 	BOOTP
+options 	BOOTP_NFSROOT
 options 	COMPAT_43
-options		INET
+options 	INET
 options         MD_ROOT
 options         MD_ROOT_SIZE=1024
-options		INVARIANTS
-options		INVARIANT_SUPPORT
-options		WITNESS
+options 	INVARIANTS
+options 	INVARIANT_SUPPORT
+options 	WITNESS
 
-options		POWERMAC
+options 	POWERMAC
 
 device		pci
 device		loop