diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 234cefe3601..3d927fecf80 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -25,7 +25,7 @@ ident		GENERIC
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 
-#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	NO_MODULES=not_yet
 
 options 	SCHED_4BSD		#4BSD scheduler
@@ -64,6 +64,11 @@ options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
+# Make an SMP-capable kernel by default
+options 	SMP			# Symmetric MultiProcessor Kernel
+# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
+device		atpic			# 8259A compatability
+
 device		acpi
 device		isa
 device		pci
@@ -92,8 +97,7 @@ device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
 device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
-#XXX #error unknown architecture
-#device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
+device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters
 
 device		adv		# Advansys SCSI adapters