diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index f9c7653391ea..449b11444275 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.alpha,v 1.80 2008/10/25 22:27:36 apb Exp $
+#	$NetBSD: Makefile.alpha,v 1.81 2008/12/11 05:27:42 alc Exp $
 
 # Makefile for NetBSD
 #
@@ -93,9 +93,6 @@ MKDEP_AFLAGS=	-x assembler-with-cpp ${AFLAGS}
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
 ##
 ## (9) port independent kernel machinery
 ##
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index cdd331f1c8f7..2e20514d1455 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amd64,v 1.25 2008/10/30 20:07:01 joerg Exp $
+#	$NetBSD: Makefile.amd64,v 1.26 2008/12/11 05:27:42 alc Exp $
 
 # Makefile for NetBSD
 #
@@ -99,32 +99,10 @@ netbsd32_sigcode.o: assym.h
 %LOAD
 
 %RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
+
+## Include rules for ACPI wakecode
 .include "$S/arch/x86/acpi/Makefile.wakecode.inc"
 
-# XXX -	Ugly, but make doesn't easily handle .o.uu (assumes it's a suffix)
-# XXX -	Also, config has no simple was to just add foo.o to the Makefile.
-#	It needs a pathname of some sort for "object"
-.if !empty(OBJS:M\/athhal.o)
-OBJS:=${OBJS:C/\/athhal.o/athhal.o/}
-
-.PATH: $S/contrib/dev/ath/public
-ATH_UUDEC?=	@${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
-		${_MKSHECHO}\
-		${UUDECODE} -p $> \> ${.TARGET}; \
-		rm -f ${.TARGET}; \
-		${UUDECODE} -p $> > ${.TARGET}
-
-athhal.o: x86_64-elf.hal.o.uu
-	${ATH_UUDEC}
-.if defined(COPTS) && !empty(COPTS:M-fno-asynchronous-unwind-tables)
-	${_MKSHECHO}\
-	${OBJCOPY} -R .eh_frame $@
-	${OBJCOPY} -R .eh_frame $@
-.endif
-.endif
-
 ##
 ## (9) port independent kernel machinery
 ##
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index ae30a3a8f8ba..ecc40e6e2b04 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.161 2008/11/27 01:57:40 joerg Exp $
+#	$NetBSD: Makefile.i386,v 1.162 2008/12/11 05:27:42 alc Exp $
 
 # Makefile for NetBSD
 #
@@ -117,8 +117,7 @@ acpi_wakeup_low.o busfunc.o kvm86call.o: assym.h
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
+## Include rules for ACPI wakecode
 .include "$S/arch/x86/acpi/Makefile.wakecode.inc"
 
 ##
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 6d04cf422b98..ad420ec70cc8 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.macppc,v 1.30 2008/11/13 10:51:23 ad Exp $
+#	$NetBSD: Makefile.macppc,v 1.31 2008/12/11 05:27:42 alc Exp $
 #
 # Makefile for NetBSD
 #
@@ -118,9 +118,6 @@ lock_stubs.o setfault.o: assym.h
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
 ##
 ## (9) port independent kernel machinery
 ##
diff --git a/sys/arch/mips/conf/Makefile.mips b/sys/arch/mips/conf/Makefile.mips
index 2ecb572736b9..ed2e3328b511 100644
--- a/sys/arch/mips/conf/Makefile.mips
+++ b/sys/arch/mips/conf/Makefile.mips
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.51 2008/11/13 10:51:23 ad Exp $
+#	$NetBSD: Makefile.mips,v 1.52 2008/12/11 05:27:42 alc Exp $
 
 # Makefile for NetBSD
 #
@@ -122,9 +122,6 @@ mips64_subr.o mipsX_subr.o sigcode.o: assym.h
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
 ##
 ## (9) port independent kernel machinery
 ##
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 8ddc3a8b8f0d..9e139a27bbd1 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-# 	$NetBSD: Makefile.sparc64,v 1.67 2008/08/30 13:23:55 martin Exp $
+# 	$NetBSD: Makefile.sparc64,v 1.68 2008/12/11 05:27:42 alc Exp $
 
 #=========================================================================
 #
@@ -143,9 +143,6 @@ cpu_in_cksum.o lock_stubs.o: assym.h
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
 ##
 ## (9) port independent kernel machinery
 ##
diff --git a/sys/arch/xen/conf/Makefile.xen b/sys/arch/xen/conf/Makefile.xen
index 3f466271f859..fb56a7af8e6d 100644
--- a/sys/arch/xen/conf/Makefile.xen
+++ b/sys/arch/xen/conf/Makefile.xen
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xen,v 1.27 2008/10/30 20:07:20 joerg Exp $
+#	$NetBSD: Makefile.xen,v 1.28 2008/12/11 05:27:42 alc Exp $
 #	NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -140,9 +140,6 @@ busfunc.o cpu_in_cksum.o cpufunc.o lock_stubs.o: assym.h
 
 %RULES
 
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
 ##
 ## (9) port independent kernel machinery
 ##