diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index ec86e5a0e7bd..d97b234995ee 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -21,10 +21,11 @@ files		"../atheros/files.ar71xx"
 hints		"AR91XX_BASE.hints"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	MODULES_OVERRIDE=""
+makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
 
 options		DDB
 options		KDB
+options 	ALQ
 
 options		SCHED_4BSD		#4BSD scheduler
 options		INET			#InterNETworking
@@ -33,6 +34,10 @@ options		INET6			#InterNETworking
 options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
+# PMC
+options		HWPMC_HOOKS
+device		hwpmc
+
 # options		NFS_LEGACYRPC
 # Debugging for use in -current
 options		INVARIANTS
@@ -49,19 +54,21 @@ options		NO_FFS_SNAPSHOT		# We don't require snapshot support
 options		IEEE80211_DEBUG
 options		IEEE80211_SUPPORT_MESH
 options		IEEE80211_SUPPORT_TDMA
+options 	IEEE80211_ALQ	# 802.11 ALQ logging support
 device		wlan            # 802.11 support
 device		wlan_wep        # 802.11 WEP support
 device		wlan_ccmp       # 802.11 CCMP support
 device		wlan_tkip       # 802.11 TKIP support
 device		wlan_xauth	# 802.11 hostap support
 
-# This will come later -adrian
-device		ath             # Atheros pci/cardbus NIC's
+# ath(4)
+device		ath             # Atheros network device
 device		ath_rate_sample
-device		ath_ahb
+device		ath_ahb		# Atheros host bus glue
 options 	ATH_DEBUG
 options		ATH_DIAGAPI
 option		ATH_ENABLE_11N
+option 		AH_DEBUG_ALQ
 
 # Don't bother compiling the whole HAL - AH_SUPPORT_AR9130 breaks the
 # rest of the 11n chipset support at the moment and the pre-AR5212
@@ -76,6 +83,7 @@ device		ath_ar9130
 options		AH_DEBUG
 option		AH_SUPPORT_AR5416
 option		AH_SUPPORT_AR9130	# Makes other chipsets not function!
+option 		AH_DEBUG_ALQ
 # interrupt mitigation not possible on AR9130
 # option		AH_AR5416_INTERRUPT_MITIGATION