diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 6ad92e4387c8..46fbc678a079 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -29,23 +29,99 @@ maxusers	0
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 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 	COMPAT_43
-options 	INET
-options         MD_ROOT
-options         MD_ROOT_SIZE=1024
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+# Platform support
+options 	POWERMAC		#NewWorld Apple PowerMacs
+options		PSIM			#GDB PSIM ppc simulator
 
-options 	POWERMAC
+options		INET			#InterNETworking
+options		INET6			#IPv6 communications protocols
+options		GEOM			#GEOMetry subsystem
+options		FFS			#Berkeley Fast Filesystem
+options		SOFTUPDATES		#Enable FFS soft updates support
+options		UFS_DIRHASH		#Improve performance on big directories
+options		MD_ROOT			#MD is a potential root device
+options		NFSCLIENT		#Network Filesystem Client
+options		NFSSERVER		#Network Filesystem Server
+#options	NFS_ROOT		#NFS usable as root device
+#options	MSDOSFS			#MSDOS Filesystem
+options		CD9660			#ISO 9660 Filesystem
+options		PROCFS			#Process filesystem (requires PSEUDOFS)
+options		PSEUDOFS		#Pseudo-filesystem framework
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+options		SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
+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	_KPOSIX_PRIORITY_SCHEDULING
 
+# Debugging for use in -current
+#options		DDB			#Enable the kernel debugger
+options		INVARIANTS		#Enable calls of extra sanity checking
+options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options		WITNESS			#Enable checks to detect deadlocks and cycles
+
+# To make an SMP kernel, the next line is needed
+#options	SMP			# Symmetric MultiProcessor Kernel
+
+# Standard busses
 device		pci
-device		loop
-device		ether
-device		miibus
-device		gem
+
+# ATA and ATAPI devices
+device		ata
+device		atadisk		# ATA disk drives
+device		atapicd		# ATAPI CDROM drives
+#device		atapifd		# ATAPI floppy drives
+#device		atapist		# ATAPI tape drives
+
+# Serial (COM) ports
+#device		sio		# 8250, 16[45]50 based serial ports
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+device		miibus		# MII bus support
+device		gem		# Sun GEM/Sun ERI/Apple HMAC
+
+# Pseudo devices - the number indicates how many units to allocated.
+device		random		# Entropy device
+device		loop		# Network loopback
+device		ether		# Ethernet support
+device		sl		# Kernel SLIP
+device		ppp		# Kernel PPP
+device		tun		# Packet tunnel.
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
+device		ofwd		# OpenFirmware disks
+device		gif		# IPv6 and IPv4 tunneling
+device		faith		# IPv6-to-IPv4 relaying/(translation)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+device		bpf		#Berkeley packet filter
+
+# USB support
+#device		uhci		# UHCI PCI->USB interface
+#device		ohci		# OHCI PCI->USB interface
+#device		usb		# USB Bus (required)
+#device		ugen		# Generic
+#device		uhid		# "Human Interface Devices"
+#device		ukbd		# Keyboard
+#device		ulpt		# Printer
+#device		umass		# Disks/Mass storage - Requires scbus and da0
+#device		ums		# Mouse
+# USB Ethernet
+#device		aue		# ADMtek USB ethernet
+#device		cue		# CATC USB ethernet
+#device		kue		# Kawasaki LSI USB ethernet
+
+# Temporary defs until things are farther along.
+makeoptions	NO_MODULES=true
+
+options		KTR
+options		KTR_COMPILE=0xffffffff
+#options		KTR_MASK=KTR_SIG
+options		KTR_VERBOSE
+
+# Diskless support
+#options 	BOOTP
+#options 	BOOTP_NFSROOT