diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index e3bc8f86ccec..21be6409b3ef 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.152 2007/12/31 15:31:55 ad Exp $
+# $NetBSD: ALL,v 1.153 2008/01/07 08:39:03 martti Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.152 $"
+#ident 		"ALL-$Revision: 1.153 $"
 
 maxusers	32		# estimated number of users
 
@@ -39,7 +39,7 @@ options 	POWERNOW_K7
 options 	POWERNOW_K8
 
 # VIA PadLock
-options		VIA_PADLOCK
+options 	VIA_PADLOCK
 
 # Intel(R) On Demand Clock Modulation (aka ODCM)
 options 	INTEL_ONDEMAND_CLOCKMOD
@@ -117,7 +117,7 @@ options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	DDB_VERBOSE_HELP
 options 	KGDB		# remote debugger
 options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-makeoptions	DEBUG="-g"	# compile full symbol table
+makeoptions 	DEBUG="-g"	# compile full symbol table
 options 	SYSCALL_STATS	# per syscall counts
 options 	SYSCALL_TIMES 	# per syscall times
 options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
@@ -151,7 +151,7 @@ options 	COMPAT_NDIS	# NDIS network driver
 options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
-options		X86EMU		# 386 Real Mode emulator
+options 	X86EMU		# 386 Real Mode emulator
 
 # File systems
 file-system 	FFS		# UFS
@@ -193,7 +193,7 @@ options 	NFSSERVER	# Network File System server
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
 				# immutable) behave as system flags.
-options		VNODE_LOCKDEBUG
+options 	VNODE_LOCKDEBUG
 
 # Networking options
 options 	GATEWAY		# packet forwarding
@@ -287,7 +287,7 @@ options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
 # work around a hardware bug that loaded fonts don't work; found on ATI cards
 options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
 # issue VGA BIOS POST on resume
-options		VGA_POST
+options 	VGA_POST
 # console scrolling support.
 options 	WSDISPLAY_SCROLLSUPPORT
 # enable VGA raster mode capable of displaying multilingual text on console
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1d2c78f46b03..4f85fb6236fe 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.876 2008/01/03 07:21:21 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.877 2008/01/07 08:39:03 martti Exp $
 #
 # GENERIC machine description file
 #
@@ -22,11 +22,11 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.876 $"
+#ident 		"GENERIC-$Revision: 1.877 $"
 
 maxusers	32		# estimated number of users
 
-makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
+makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
 							# tune for more modern
 
 # CPU-related options.
@@ -47,7 +47,7 @@ options 	POWERNOW_K7
 options 	POWERNOW_K8
 
 # VIA PadLock
-#options	VIA_PADLOCK
+#options 	VIA_PADLOCK
 
 # Intel(R) On Demand Clock Modulation (aka ODCM)
 #options 	INTEL_ONDEMAND_CLOCKMOD
@@ -80,7 +80,7 @@ options 	MULTIBOOT	# Multiboot support (see multiboot(8))
 # and/or the maximum address used by the system.
 # Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
 # and can deal with holes in the memory layout.
-#options	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
+#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
 #options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)
 
 # Standard system options
@@ -130,7 +130,7 @@ options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	DDB_VERBOSE_HELP
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY
index 614c2cf94ff2..f2af98abf7a8 100644
--- a/sys/arch/i386/conf/GENERIC_PS2TINY
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_PS2TINY,v 1.49 2007/11/15 19:18:32 ad Exp $
+#	$NetBSD: GENERIC_PS2TINY,v 1.50 2008/01/07 08:39:05 martti Exp $
 #
 #	GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
 #	IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -67,8 +67,8 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
-makeoptions	COPTS="-Os"	# generates smaller code than -O2, -O1
+#makeoptions 	DEBUG="-g"	# compile full symbol table
+makeoptions 	COPTS="-Os"	# generates smaller code than -O2, -O1
 
 # File systems
 file-system 	FFS		# UFS
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index c89eef69bb93..1d7e850f2dc2 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.109 2007/11/15 19:18:32 ad Exp $
+#	$NetBSD: GENERIC_TINY,v 1.110 2008/01/07 08:39:05 martti Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-makeoptions	COPTS="-Os"
+makeoptions 	COPTS="-Os"
 
 maxusers	8		# estimated number of users
 
@@ -66,7 +66,7 @@ options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 #options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 #options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -89,7 +89,7 @@ options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # File systems
 file-system 	FFS		# UFS
@@ -371,7 +371,7 @@ wdc1	at isa? port 0x170 irq 15
 
 # ATA (IDE) bus support
 atabus* at ata?
-#options	ATADEBUG
+#options 	ATADEBUG
 
 # IDE drives
 wd*	at atabus? drive ?			# the drives themselves
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index 3c4b2162ee0b..fcd8b73e14a1 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.319 2007/11/14 17:54:57 ad Exp $
+#	$NetBSD: INSTALL,v 1.320 2008/01/07 08:39:06 martti Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -13,9 +13,9 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-makeoptions	CPUFLAGS="-march=i486 -mtune=i486"	# i486 is densest code
-makeoptions	COPTS="-Os"
-makeoptions	USE_SSP="no"
+makeoptions 	CPUFLAGS="-march=i486 -mtune=i486"	# i486 is densest code
+makeoptions 	COPTS="-Os"
+makeoptions 	USE_SSP="no"
 
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
@@ -64,10 +64,10 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 options 	USERCONF	# userconf(4) support
 options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 #options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-no options	EXEC_AOUT
+no options 	EXEC_AOUT
 
-no options	RFC2292		# Previous version of Adv. Sockets API for IPv6
-no options	PTRACE		# Include ptrace(2)
+no options 	RFC2292		# Previous version of Adv. Sockets API for IPv6
+no options 	PTRACE		# Include ptrace(2)
 
 # Diagnostic/debugging support options
 #options 	DIAGNOSTIC	# expensive kernel consistency checks
@@ -78,7 +78,7 @@ options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 #options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -101,7 +101,7 @@ options 	COMPAT_40	# NetBSD 4.0
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # File systems
 file-system 	FFS		# UFS
diff --git a/sys/arch/i386/conf/INSTALL.MP b/sys/arch/i386/conf/INSTALL.MP
index 1cae59fce604..ee173b99c4a7 100644
--- a/sys/arch/i386/conf/INSTALL.MP
+++ b/sys/arch/i386/conf/INSTALL.MP
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL.MP,v 1.10 2007/11/14 17:54:57 ad Exp $
+#	$NetBSD: INSTALL.MP,v 1.11 2008/01/07 08:39:06 martti Exp $
 #
 #	INSTALL.MP -- Install, plus enable Multiprocessor support.
 #	Mostly to let people test-boot MP systems.
@@ -15,8 +15,8 @@ options 	MPVERBOSE
 options 	DEBUG
 options 	MPBIOS		# configure CPUs and APICs using MPBIOS
 
-no makeoptions	CPUFLAGS
-makeoptions	CPUFLAGS="-march=pentium -mtune=i486"
-makeoptions	COPTS="-Os"
+no makeoptions 	CPUFLAGS
+makeoptions 	CPUFLAGS="-march=pentium -mtune=i486"
+makeoptions 	COPTS="-Os"
 
 ioapic*		at mainbus? apid ?
diff --git a/sys/arch/i386/conf/INSTALL_LARGE b/sys/arch/i386/conf/INSTALL_LARGE
index d4c429445ff9..085669d8ad8f 100644
--- a/sys/arch/i386/conf/INSTALL_LARGE
+++ b/sys/arch/i386/conf/INSTALL_LARGE
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_LARGE,v 1.11 2007/12/05 00:19:41 xtraeme Exp $
+#	$NetBSD: INSTALL_LARGE,v 1.12 2008/01/07 08:39:06 martti Exp $
 #
 #	INSTALL_LARGE -- INSTALL suitable for modern machines
 #
@@ -9,8 +9,8 @@ acpi0 		at mainbus0
 
 #options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
 #options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
-options		ACPIVERBOSE
-options		ACPI_SCANPCI
+options 	ACPIVERBOSE
+options 	ACPI_SCANPCI
 
 ioapic* 	at mainbus?
 bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index b37e3a818061..aa838418e0ea 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.138 2007/11/15 19:18:32 ad Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.139 2008/01/07 08:39:06 martti Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -22,7 +22,7 @@ options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 options 	MEMORY_DISK_ROOT_SIZE=3900	# size of memory disk, in blocks
 
-makeoptions	COPTS="-Os"		# generates smaller code than -O2, -O1
+makeoptions 	COPTS="-Os"		# generates smaller code than -O2, -O1
 
 maxusers	32		# estimated number of users
 
@@ -72,7 +72,7 @@ options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 #options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 #options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -95,7 +95,7 @@ options 	COMPAT_40	# NetBSD 4.0
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # File systems
 file-system 	FFS		# UFS
@@ -478,6 +478,6 @@ pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
-options	NO_DEV_PTM
+options 	NO_DEV_PTM
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index d5b969fdf461..7b1a8e6df1d5 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.115 2007/11/15 19:18:32 ad Exp $
+#	$NetBSD: INSTALL_TINY,v 1.116 2008/01/07 08:39:06 martti Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -12,7 +12,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
+makeoptions 	COPTS="-Os"		# Optimise for space. Implies -O2
 
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
@@ -60,7 +60,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 #options 	USERCONF	# userconf(4) support
 options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 #options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-no options	EXEC_AOUT	# we don't a.out support
+no options 	EXEC_AOUT	# we don't a.out support
 
 # Diagnostic/debugging support options
 #options 	DIAGNOSTIC	# expensive kernel consistency checks
@@ -71,7 +71,7 @@ no options	EXEC_AOUT	# we don't a.out support
 #options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 #options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -94,7 +94,7 @@ no options	EXEC_AOUT	# we don't a.out support
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # File systems
 file-system 	FFS		# UFS
@@ -525,6 +525,6 @@ pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
-options	NO_DEV_PTM
+options 	NO_DEV_PTM
 #pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/i386/conf/INSTALL_XEN2_DOMU b/sys/arch/i386/conf/INSTALL_XEN2_DOMU
index ef0d49483f5b..eaef9ec936e3 100644
--- a/sys/arch/i386/conf/INSTALL_XEN2_DOMU
+++ b/sys/arch/i386/conf/INSTALL_XEN2_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XEN2_DOMU,v 1.15 2007/11/14 17:54:58 ad Exp $
+# $NetBSD: INSTALL_XEN2_DOMU,v 1.16 2008/01/07 08:39:07 martti Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -6,8 +6,8 @@ options 	XEN
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-makeoptions	CPUFLAGS="-march=i686"
-makeoptions	COPTS="-Os"
+makeoptions 	CPUFLAGS="-march=i686"
+makeoptions 	COPTS="-Os"
 
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
@@ -51,7 +51,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 #options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index 5a9eb3ed8105..cdfcb585700a 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.58 2007/11/14 17:54:58 ad Exp $
+# $NetBSD: NET4501,v 1.59 2008/01/07 08:39:07 martti Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,15 +10,15 @@ include 	"arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.58 $"
+#ident 		"NET4501-$Revision: 1.59 $"
 
 maxusers	32		# estimated number of users
 
 # AMD Elan SC520's timer runs at a different frequency
 options 	TIMER_FREQ=1189200
 
-makeoptions	CPUFLAGS="-march=i486 -mtune=i486"
-makeoptions	COPTS="-Os"
+makeoptions 	CPUFLAGS="-march=i486 -mtune=i486"
+makeoptions 	COPTS="-Os"
 
 # CPU-related options.
 #options 	MATH_EMULATE	# floating point emulation
@@ -79,7 +79,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -105,7 +105,7 @@ options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	COMPAT_MACH	# binary compatibility with Mach binaries
 #options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
-options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # File systems
 file-system 	FFS		# UFS
diff --git a/sys/arch/i386/conf/PARALLELS b/sys/arch/i386/conf/PARALLELS
index 6e09d599a1e1..66112e13ee32 100644
--- a/sys/arch/i386/conf/PARALLELS
+++ b/sys/arch/i386/conf/PARALLELS
@@ -1,4 +1,4 @@
-# $NetBSD: PARALLELS,v 1.18 2007/12/14 10:57:48 jmmv Exp $
+# $NetBSD: PARALLELS,v 1.19 2008/01/07 08:39:07 martti Exp $
 #
 # PARALLELS machine description file
 #
@@ -12,7 +12,7 @@ include 	"arch/i386/conf/std.i386"
 
 maxusers	32
 
-makeoptions	CPUFLAGS="-march=pentiumpro -mtune=pentiumpro"
+makeoptions 	CPUFLAGS="-march=pentiumpro -mtune=pentiumpro"
 
 # CPU-related options.
 options 	VM86		# virtual 8086 emulation
@@ -59,7 +59,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 #options 	LOCKDEBUG
 
 # Compatibility options
@@ -386,8 +386,8 @@ pseudo-device	wsfont
 # Pass-to-Userspace Transporter
 pseudo-device	putter
 
-#options	FILEASSOC		# fileassoc(9) - required for Veriexec 
-#options	FILEASSOC_NHOOKS=4	# Default number of storage slots
+#options 	FILEASSOC		# fileassoc(9) - required for Veriexec 
+#options 	FILEASSOC_NHOOKS=4	# Default number of storage slots
 
 # Veriexec
 #pseudo-device	veriexec
diff --git a/sys/arch/i386/conf/QEMU b/sys/arch/i386/conf/QEMU
index 6860656902ce..6e0a893cfa46 100644
--- a/sys/arch/i386/conf/QEMU
+++ b/sys/arch/i386/conf/QEMU
@@ -1,4 +1,4 @@
-# $NetBSD: QEMU,v 1.14 2007/12/31 15:31:56 ad Exp $
+# $NetBSD: QEMU,v 1.15 2008/01/07 08:39:07 martti Exp $
 #
 # QEMU machine description file
 #
@@ -11,11 +11,11 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"QEMU-$Revision: 1.14 $"
+#ident 		"QEMU-$Revision: 1.15 $"
 
 maxusers	32		# estimated number of users
 
-makeoptions	CPUFLAGS="-march=pentiumpro -mtune=pentiumpro"
+makeoptions 	CPUFLAGS="-march=pentiumpro -mtune=pentiumpro"
 
 # CPU-related options.
 #options 	MATH_EMULATE	# floating point emulation
@@ -96,7 +96,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
@@ -456,7 +456,7 @@ pseudo-device	nsmb			# experimental - SMB requester
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
 
-#options	FILEASSOC		# fileassoc(9) - required for Veriexec 
+#options 	FILEASSOC		# fileassoc(9) - required for Veriexec 
 
 # Veriexec
 #pseudo-device	veriexec
diff --git a/sys/arch/i386/conf/XBOX b/sys/arch/i386/conf/XBOX
index 5fa1c489eaf6..22f1206704c5 100644
--- a/sys/arch/i386/conf/XBOX
+++ b/sys/arch/i386/conf/XBOX
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.11 2007/11/14 17:54:58 ad Exp $
+# $NetBSD: XBOX,v 1.12 2008/01/07 08:39:07 martti Exp $
 #
 # XBOX -- A basic Microsoft XBox kernel config file.
 #
@@ -14,7 +14,7 @@ options 	MSGBUFSIZE=65536	# for PCI_CONFIG_DUMP space
 
 #options 	NFS_BOOT_RWSIZE=1024	# kue0 USB ethernet has issues here
 
-makeoptions	CPUFLAGS="-march=i686 -mtune=pentiumpro"
+makeoptions 	CPUFLAGS="-march=i686 -mtune=pentiumpro"
 
 options 	TIMER_FREQ=1125000
 options 	XBOX		# kernel support for xbox
@@ -36,7 +36,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 options 	COMPAT_30	# NetBSD 3.0
@@ -72,8 +72,8 @@ options 	NFS_BOOT_DHCP
 #
 # builtin terminal emulations
 options 	WSEMUL_VT100		# VT100 / VT220 emulation
-options		WSDISPLAY_COMPAT_RAWKBD
-options		WSDISPLAY_COMPAT_USL
+options 	WSDISPLAY_COMPAT_RAWKBD
+options 	WSDISPLAY_COMPAT_USL
 # customization of console and kernel output - see dev/wscons/wsdisplayvar.h
 options 	PCDISPLAY_SOFTCURSOR
 
diff --git a/sys/arch/i386/conf/XEN2_DOM0 b/sys/arch/i386/conf/XEN2_DOM0
index 19b40fa7cf83..e16953d10a66 100644
--- a/sys/arch/i386/conf/XEN2_DOM0
+++ b/sys/arch/i386/conf/XEN2_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOM0,v 1.37 2007/12/31 15:31:56 ad Exp $
+# $NetBSD: XEN2_DOM0,v 1.38 2008/01/07 08:39:07 martti Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -17,7 +17,7 @@ options 	DOM0OPS
 # to a domU, at the expense of a higher memory usage by the network stack.
 #options 	MCLSHIFT=12
 
-makeoptions	CPUFLAGS="-march=i686"
+makeoptions 	CPUFLAGS="-march=i686"
 
 #options 	VM86		# virtual 8086 emulation
 #options 	USER_LDT	# user-settable LDT; used by WINE
@@ -58,7 +58,7 @@ options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
diff --git a/sys/arch/i386/conf/XEN2_DOMU b/sys/arch/i386/conf/XEN2_DOMU
index ed6076deec30..9aa3439d7d9d 100644
--- a/sys/arch/i386/conf/XEN2_DOMU
+++ b/sys/arch/i386/conf/XEN2_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOMU,v 1.12 2007/12/31 15:31:57 ad Exp $
+# $NetBSD: XEN2_DOMU,v 1.13 2008/01/07 08:39:07 martti Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -14,7 +14,7 @@ maxusers	32		# estimated number of users
 options 	XEN
 #options 	DOM0OPS
 
-makeoptions	CPUFLAGS="-march=i686"
+makeoptions 	CPUFLAGS="-march=i686"
 
 #options 	VM86		# virtual 8086 emulation
 #options 	USER_LDT	# user-settable LDT; used by WINE
@@ -55,7 +55,7 @@ options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
-#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions 	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
diff --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0
index c2b3506deb8e..bc944caa321e 100644
--- a/sys/arch/i386/conf/XEN3_DOM0
+++ b/sys/arch/i386/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.7 2007/12/09 20:27:46 jmcneill Exp $
+#	$NetBSD: XEN3_DOM0,v 1.8 2008/01/07 08:39:07 martti Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -7,7 +7,7 @@ include "arch/i386/conf/XEN2_DOM0"
 options 	XEN3	#Xen 3.x support
 
 # boot messages with MPBIOS, acpi and ioapic can be quite large
-options		MSGBUFSIZE=24576
+options 	MSGBUFSIZE=24576
 
 vcpu*		at hypervisor?		# Xen virtual CPUs
 xenbus*		at hypervisor?		# Xen virtual bus
@@ -15,13 +15,13 @@ ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
 
 acpi0 		at hypervisor?
-options		MPBIOS
-options		MPDEBUG
-options		MPVERBOSE
+options 	MPBIOS
+options 	MPDEBUG
+options 	MPVERBOSE
 options 	ACPIVERBOSE
-#options 	 PCI_ADDR_FIXUP		# fixup PCI I/O addresses
-#options 	 PCI_BUS_FIXUP		# fixup PCI bus numbering
-#options 	 PCI_INTR_FIXUP		# fixup PCI interrupt routing
+#options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
+#options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
+#options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing
 
 ioapic*		at mainbus? apid ?
 
diff --git a/sys/arch/i386/conf/largepages.inc b/sys/arch/i386/conf/largepages.inc
index fd5a87bd18f7..d7c03f6b64dd 100644
--- a/sys/arch/i386/conf/largepages.inc
+++ b/sys/arch/i386/conf/largepages.inc
@@ -1,7 +1,7 @@
-#	$NetBSD: largepages.inc,v 1.2 2007/10/18 15:28:34 yamt Exp $
+#	$NetBSD: largepages.inc,v 1.3 2008/01/07 08:39:07 martti Exp $
 #
 # Options to create a kernel suitable for mapping with large
 # pages.
 #
 
-makeoptions	KERN_LDSCRIPT="kern.ldscript.4MB"
+makeoptions 	KERN_LDSCRIPT="kern.ldscript.4MB"