diff --git a/sys/arch/atari/Makefile b/sys/arch/atari/Makefile
index d721f5e1107b..b469668b92df 100644
--- a/sys/arch/atari/Makefile
+++ b/sys/arch/atari/Makefile
@@ -1,14 +1,20 @@
-#	$NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.8 2011/04/04 19:44:16 dyoung Exp $
 
 # Makefile for atari tags file and boot blocks
 
 # Find where m68k source files are for inclusion in tags
 .include <../m68k/Makefile.inc>
 
-TATARI=	../atari/tags
-SATARI=	../atari/atari/*.[ch] ../atari/include/*.h \
-	../atari/dev/*.[ch]
-AATARI=	../atari/atari/*.s
+TATARI=	${SYSDIR}/arch/atari/tags
+SATARI=		${SYSDIR}/arch/atari/atari/*.[ch]
+SATARI+=	${SYSDIR}/arch/atari/include/*.h
+SATARI+=	${SYSDIR}/arch/atari/dev/*.[ch]
+SATARI+=	${SYSDIR}/arch/atari/isa/*.[ch]
+SATARI+=	${SYSDIR}/arch/atari/pci/*.[ch]
+SATARI+=	${SYSDIR}/arch/atari/vme/*.[ch]
+
+AATARI=		${SYSDIR}/arch/atari/atari/*.s
+AATARI+=	${SYSDIR}/arch/atari/dev/*.s
 
 # Directories in which to place tags links
 DATARI=	atari dev include
@@ -16,7 +22,9 @@ DATARI=	atari dev include
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TATARI} ${SATARI} ${SM68K} ${COMM}
+	-rm -f ${TATARI}
+	-echo ${SATARI} ${SM68K} | xargs ctags -wadtf ${TATARI}
+	-${FINDCOMM} | xargs ctags -wadtf ${TATARI}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AATARI} ${AM68K} | \
 	    ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 	    >> ${TATARI}
diff --git a/sys/arch/cats/Makefile b/sys/arch/cats/Makefile
index 2371afabf8a9..abde780af2b5 100644
--- a/sys/arch/cats/Makefile
+++ b/sys/arch/cats/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:44:37 dyoung Exp $
 
 # Makefile for cats tags file and boot blocks
 
-TCATS=	../cats/tags
-SCATS=	../cats/cats/*.[ch] ../cats/include/*.h \
-		../cats/isa/*.[ch]
-ACATS=	../cats/cats/*.S
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
+TCATS=	${SYSDIR}/arch/cats/tags
+SCATS=	${SYSDIR}/arch/cats/cats/*.[ch] ${SYSDIR}/arch/cats/include/*.h \
+	${SYSDIR}/arch/cats/pci/*.[ch]
 
 # Directories in which to place tags links
 DCATS=	isa include
@@ -13,10 +15,12 @@ DCATS=	isa include
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TCATS} ${SCATS} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} | \
+	-rm -f ${TCATS}
+	-echo ${SCATS} ${SARM} | xargs ctags -wadtf ${TCATS}
+	-${FINDCOMM} | xargs ctags -wadtf ${TCATS}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} ${AARM} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TCATS}
 	sort -o ${TCATS} ${TCATS}
 
diff --git a/sys/arch/cobalt/Makefile b/sys/arch/cobalt/Makefile
index dea50ff636fe..24ef9ea97f7b 100644
--- a/sys/arch/cobalt/Makefile
+++ b/sys/arch/cobalt/Makefile
@@ -1,14 +1,16 @@
-#	$NetBSD: Makefile,v 1.5 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.6 2011/04/04 19:45:00 dyoung Exp $
 
 # Makefile for cobalt tags file
 
 # Find where mips source files are for inclusion in tags
 .include <../mips/Makefile.inc>
 
-TCOBALT=	../cobalt/tags
-SCOBALT=	../cobalt/cobalt/*.[ch] ../cobalt/include/*.h \
-		../cobalt/dev/*.[ch] ../cobalt/pci/*.[ch]
-ACOBALT=	../cobalt/cobalt/*.S
+TCOBALT=	${SYSDIR}/arch/cobalt/tags
+SCOBALT=	${SYSDIR}/arch/cobalt/cobalt/*.[ch] \
+		${SYSDIR}/arch/cobalt/include/*.h \
+		${SYSDIR}/arch/cobalt/dev/*.[ch] \
+		${SYSDIR}/arch/cobalt/pci/*.[ch]
+ACOBALT=	${SYSDIR}/arch/cobalt/cobalt/*.S
 
 # Directories in which to place tags links
 DCOBALT=	pci include
@@ -16,7 +18,9 @@ DCOBALT=	pci include
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TCOBALT} ${SCOBALT} ${SMIPS} ${COMM}
+	-rm -f ${TCOBALT}
+	-echo ${SCOBALT} ${SMIPS} | xargs ctags -wadtf ${TCOBALT}
+	-${FINDCOMM} | xargs ctags -wadtf ${TCOBALT}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACOBALT} ${AMIPS} | \
 	    ${TOOL_SED} -e \
 		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
diff --git a/sys/arch/evbarm/Makefile b/sys/arch/evbarm/Makefile
index 2bf99b861f48..0c9353efd50c 100644
--- a/sys/arch/evbarm/Makefile
+++ b/sys/arch/evbarm/Makefile
@@ -1,17 +1,67 @@
-#	$NetBSD: Makefile,v 1.6 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.7 2011/04/04 19:45:24 dyoung Exp $
 
 # Makefile for evbarm tags file and boot blocks
 
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
 TEVBARM=	${SYSDIR}/arch/evbarm/tags
-SEVBARM=	${SYSDIR}/arch/arm/xscale/*.[ch] \
-		${SYSDIR}/arch/evbarm/dev/*.[ch] \
-		${SYSDIR}/arch/evbarm/ifpga/*.[ch] \
-		${SYSDIR}/arch/evbarm/include/*.h \
-		${SYSDIR}/arch/evbarm/integrator/*.[ch] \
-		${SYSDIR}/arch/evbarm/iq31244/*.[ch] \
-		${SYSDIR}/arch/evbarm/iq80310/*.[ch] \
-		${SYSDIR}/arch/evbarm/iq80321/*.[ch]
-AEVBARM=	${SYSDIR}/arch/evbarm/integrator/*.S
+SEVBARM=	${SYSDIR}/arch/evbarm/adi_brh/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/armadillo/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/beagle/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/cp3100/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/dev/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/evbarm/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/g42xxeb/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/gemini/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/gumstix/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/hdl_g/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/ifpga/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/imx31/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/include/*.h
+SEVBARM+=	${SYSDIR}/arch/evbarm/integrator/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/iq31244/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/iq80310/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/iq80321/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/ixdp425/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/ixm1200/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/lubbock/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/marvell/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/mpcsa/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/netwalker/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/npwr_fc/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/nslu2/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/osk5912/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/smdk2xx0/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/tsarm/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/evbarm/viper/*.[ch]
+SEVBARM+=	${SYSDIR}/arch/arm/xscale/*.[ch]
+
+AEVBARM=	${SYSDIR}/arch/evbarm/adi_brh/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/armadillo/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/beagle/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/g42xxeb/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/gemini/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/gumstix/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/hdl_g/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/imx31/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/ixdp425/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/ixm1200/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/lubbock/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/marvell/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/mpcsa/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/netwalker/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/nslu2/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/smdk2xx0/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/tisdp24xx/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/tsarm/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/viper/*.S
+AEVBARM+=	${SYSDIR}/arch/arm/xscale/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/integrator/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/iq80310/*.S
+AEVBARM+=	${SYSDIR}/arch/evbarm/iq80321/*.S
 
 # Directories in which to place tags links
 DEVBARM=	include
@@ -20,11 +70,11 @@ DEVBARM=	include
 
 tags:
 	-rm -f ${TEVBARM}
-	-echo ${SEVBARM} | xargs ctags -wadtf ${TEVBARM}
+	-echo ${SEVBARM} ${SARM} | xargs ctags -wadtf ${TEVBARM}
 	-${FINDCOMM} | xargs ctags -wadtf ${TEVBARM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} | \
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} ${AARM} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TEVBARM}
 	sort -o ${TEVBARM} ${TEVBARM}
 
diff --git a/sys/arch/evbmips/Makefile b/sys/arch/evbmips/Makefile
index 53b388fc7c48..15c78925d730 100644
--- a/sys/arch/evbmips/Makefile
+++ b/sys/arch/evbmips/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.8 2011/04/04 19:46:40 dyoung Exp $
 
 # Makefile for evbmips tags file and boot blocks
 
@@ -7,9 +7,15 @@
 
 # XXX !  fix this
 TEVBMIPS=	${SYSDIR}/arch/evbmips/tags
-SEVBMIPS=	${SYSDIR}/arch/evbmips/evbmips/*.[ch] \
-		${SYSDIR}/arch/evbmips/include/*.h \
-		${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS=	${SYSDIR}/arch/evbmips/adm5120/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/alchemy/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/atheros/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/evbmips/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/gdium/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/include/*.h
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/malta/*.[ch]
+SEVBMIPS+=	${SYSDIR}/arch/evbmips/rmixl/*.[ch]
 AEVBMIPS=	${SYSDIR}/arch/evbmips/evbmips/*.S
 
 # Directories in which to place tags links
@@ -23,7 +29,7 @@ tags:
 	-${FINDCOMM} | xargs ctags -wadtf ${TEVBMIPS}
 	egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AEVBMIPS} ${AMIPS} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TEVBMIPS}
 	sort -o ${TEVBMIPS} ${TEVBMIPS}
 
diff --git a/sys/arch/evbppc/Makefile b/sys/arch/evbppc/Makefile
index 49a8bb0b81d0..7b5788d050cd 100644
--- a/sys/arch/evbppc/Makefile
+++ b/sys/arch/evbppc/Makefile
@@ -1,32 +1,39 @@
-#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:28 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2011/04/04 19:46:40 dyoung Exp $
 
-ETAGS?= etags
+.include <../powerpc/Makefile.inc>
 
 # XXX Fix this to deal with multiple "evbppc" ports.
-SEVBPPC=	evbppc/*.[ch] include/*.h
-AEVBPPC=
+TEVBPPC=	${SYSDIR}/arch/evbppc/tags
+SEVBPPC=	${SYSDIR}/arch/evbppc/evbppc/*.[ch]
+SEVBPPC+=	${SYSDIR}/arch/evbppc/include/*.h
+SEVBPPC+=	${SYSDIR}/arch/evbppc/pmppc/dev/*.[ch]
+SEVBPPC+=	${SYSDIR}/arch/evbppc/pmppc/pci/*.[ch]
+SEVBPPC+=	${SYSDIR}/arch/evbppc/pmppc/*.[ch]
+AEVBPPC=	${SYSDIR}/arch/evbppc/ev64260/*.S \
+		${SYSDIR}/arch/evbppc/explora/*.S \
+		${SYSDIR}/arch/evbppc/mpc85xx/*.S \
+		${SYSDIR}/arch/evbppc/obs405/*.S \
+		${SYSDIR}/arch/evbppc/pmppc/*.S \
+		${SYSDIR}/arch/evbppc/virtex/*.S \
+		${SYSDIR}/arch/evbppc/walnut/*.S
 
-SPPC=		../powerpc/ibm4xx/*.[ch] ../powerpc/powerpc/*.[ch] \
-		../powerpc/include/*.h ../powerpc/include/ibm4xx/*.h \
-		../powerpc/fpu/*.[ch]
-APPC=		../powerpc/ibm4xx/*.[sS] ../powerpc/powerpc/*.[sS]
-LPPC=		../../lib/libkern/arch/powerpc/*.[chsS] \
-		../../lib/libkern/*.[ch] \
-		../../lib/libsa/*.[ch]
+DEVBPPC=	include
 
-SYSDIR=		../..
 .include "../../kern/Make.tags.inc"
 
-.ifmake TAGS
-COMM!=  find ${SYSDIR} -name "arch" -prune -o -name "*.[ch]" -print 
-.endif
+tags:
+	-rm -f ${TEVBPPC}
+	-echo ${SEVBPPC} ${SPPC} | xargs ctags -wadtf ${TEVBPPC}
+	-${FINDCOMM} | xargs ctags -wadtf ${TEVBPPC}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBPPC} ${APPC} | \
+	    ${TOOL_SED} -e \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
+	    >> ${TEVBPPC}
+	sort -o ${TEVBPPC} ${TEVBPPC}
 
-TAGS: ${SEVBPPC} ${COMM} ${SPPC} ${COMM} ${ASPARC64}
-	@echo Making TAGS...
-	@${ETAGS} ${SEVBPPC} ${COMM} ${SPPC} ${COMM} "--regex=/^GLOBAL(\(.*\))/\1/" \
-		"--regex=/^_C_LABEL(\(.*\)):/\1/" "--regex=/^\(.*\):/\1/" \
-		"--regex=/^ENTRY(\(.*\)):/\1/" "--regex=/^ASENTRY(\(.*\)):/\1/" \
-		${APPC} ${AEVBPPC}
+links:
+	-for i in ${DEVBPPC}; do \
+	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
 SUBDIR=	compile include
diff --git a/sys/arch/i386/Makefile b/sys/arch/i386/Makefile
index 18834621ad21..f052f2f06aa9 100644
--- a/sys/arch/i386/Makefile
+++ b/sys/arch/i386/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2011/03/18 19:48:12 dyoung Exp $
+#	$NetBSD: Makefile,v 1.40 2011/04/04 19:46:40 dyoung Exp $
 
 # Makefile for i386 tags file and boot blocks
 
@@ -18,6 +18,11 @@ SI386+=	${SYSDIR}/arch/x86/x86/*.[ch] \
 	${SYSDIR}/arch/x86/acpi/*.[ch] \
 	${SYSDIR}/arch/x86/include/*.h \
 	${SYSDIR}/arch/x86/isa/*.[ch] \
+	${SYSDIR}/arch/xen/include/*.h \
+	${SYSDIR}/arch/xen/i386/*.[ch] \
+	${SYSDIR}/arch/xen/x86/*.[ch] \
+	${SYSDIR}/arch/xen/xen/*.[ch] \
+	${SYSDIR}/arch/xen/xenbus/*.[ch] \
 	${SYSDIR}/arch/x86/pci/*.[ch]
 AI386=	${SYSDIR}/arch/i386/i386/*.S
 
@@ -29,7 +34,7 @@ DI386=	i386 eisa isa include pci
 tags:
 	-rm -f ${TI386}
 	-echo ${SI386} | xargs ctags -wadtf ${TI386}
-	-find -H ${SYSDIR}/external/intel-public/acpica/dist/ -name '*.[ch]' | \
+	-find -H ${SYSDIR}/external/bsd/acpica/dist/ -name '*.[ch]' | \
 	    sort -t / -u | xargs ctags -wadtf ${TI386}
 	-${FINDCOMM} | xargs ctags -wadtf ${TI386}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \
diff --git a/sys/arch/mips/Makefile.inc b/sys/arch/mips/Makefile.inc
index e669661d04c5..cae9bb5ad864 100644
--- a/sys/arch/mips/Makefile.inc
+++ b/sys/arch/mips/Makefile.inc
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.6 2007/03/20 08:52:04 dyoung Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2011/04/04 19:47:50 dyoung Exp $
 
 AMIPS=	${SYSDIR}/arch/mips/mips/*.S
-SMIPS=	${SYSDIR}/arch/mips/mips/*.[ch] ${SYSDIR}/arch/mips/include/*.h
+AMIPS+=	${SYSDIR}/arch/mips/rmi/*.S
+SMIPS=	${SYSDIR}/arch/mips/mips/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/include/*.h
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/dev/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/include/*.h
@@ -12,3 +14,8 @@ SMIPS+=	${SYSDIR}/arch/mips/atheros/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/atheros/dev/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/atheros/include/*.h
 SMIPS+=	${SYSDIR}/arch/mips/bonito/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/cfe/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/rmi/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/dev/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/include/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/pci/*.[ch]
diff --git a/sys/arch/netwinder/Makefile b/sys/arch/netwinder/Makefile
index e0cbb856ee1c..e8de4fef16e4 100644
--- a/sys/arch/netwinder/Makefile
+++ b/sys/arch/netwinder/Makefile
@@ -1,22 +1,27 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:47:00 dyoung Exp $
 
 # Makefile for netwinder tags file and boot blocks
 
-TNETWINDER=	../netwinder/tags
-SNETWINDER=	../netwinder/netwinder/*.[ch] ../netwinder/include/*.h \
-		../netwinder/isa/*.[ch] ../netwinder/pci/*.[ch]
-ANETWINDER=	../netwinder/netwinder/*.s
+.include <../arm/Makefile.inc>
+
+TNETWINDER=	${SYSDIR}/arch/netwinder/tags
+SNETWINDER=	${SYSDIR}/arch/netwinder/netwinder/*.[ch] \
+		${SYSDIR}/arch/netwinder/include/*.h \
+		${SYSDIR}/arch/netwinder/pci/*.[ch]
+ANETWINDER=	${SYSDIR}/arch/netwinder/netwinder/*.S
 
 # Directories in which to place tags links
-DNETWINDER=	isa pci include
+DNETWINDER=	pci include
 
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TNETWINDER} ${SNETWINDER} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANETWINDER} | \
+	-rm -f ${TNETWINDER}
+	-echo ${SNETWINDER} ${SARM} | xargs ctags -wadtf ${TNETWINDER}
+	-${FINDCOMM} | xargs ctags -wadtf ${TNETWINDER}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANETWINDER} ${AARM} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TNETWINDER}
 	sort -o ${TNETWINDER} ${TNETWINDER}
 
diff --git a/sys/arch/ofppc/Makefile b/sys/arch/ofppc/Makefile
index 4c223b3f94ba..772ddf6e0b06 100644
--- a/sys/arch/ofppc/Makefile
+++ b/sys/arch/ofppc/Makefile
@@ -1,4 +1,32 @@
-#	$NetBSD: Makefile,v 1.6 2003/01/06 17:40:43 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2011/04/04 19:47:21 dyoung Exp $
+
+.include <../powerpc/Makefile.inc>
+
+TOFPPC=	${SYSDIR}/arch/ofppc/tags
+SOFPPC=	${SYSDIR}/arch/ofppc/ofppc/*.[ch] \
+	${SYSDIR}/arch/ofppc/isa/*.[ch] \
+	${SYSDIR}/arch/ofppc/pci/*.[ch] \
+	${SYSDIR}/arch/ofppc/include/*.h
+AOFPPC=	${SYSDIR}/arch/ofppc/ofppc/*.S
+
+DOFPPC=	include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+	-rm -f ${TOFPPC}
+	-echo ${SOFPPC} ${SPPC} | xargs ctags -wadtf ${TOFPPC}
+	-${FINDCOMM} | xargs ctags -wadtf ${TOFPPC}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AOFPPC} ${APPC} | \
+	    ${TOOL_SED} -e \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
+	    >> ${TOFPPC}
+	sort -o ${TOFPPC} ${TOFPPC}
+
+links:
+	-for i in ${DOFPPC}; do \
+	    cd $$i && rm -f tags; ln -s ../tags tags; done
+
 
 SUBDIR=	compile include stand
 
diff --git a/sys/arch/prep/Makefile b/sys/arch/prep/Makefile
index 7593e4bda533..8175435acf00 100644
--- a/sys/arch/prep/Makefile
+++ b/sys/arch/prep/Makefile
@@ -1,22 +1,25 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:47:49 dyoung Exp $
 
-# Makefile for tags file
+.include <../powerpc/Makefile.inc>
 
-TPREP=	../prep/tags
-SPREP=	../prep/prep/*.[ch] ../prep/include/*.h ../prep/isa/*.[ch] \
-	../prep/pci/*.[ch]
-APREP=	../prep/prep/*.[sS]
+TPREP=	${SYSDIR}/arch/prep/tags
+SPREP=	${SYSDIR}/arch/prep/prep/*.[ch] \
+	${SYSDIR}/arch/prep/isa/*.[ch] \
+	${SYSDIR}/arch/prep/pci/*.[ch] \
+	${SYSDIR}/arch/prep/include/*.h
+APREP=	${SYSDIR}/arch/prep/prep/*.S
 
-# Directories in which to place tags links
-DPREP=       include
+DPREP=	include
 
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TPREP} ${SPREP} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} | \
+	-rm -f ${TPREP}
+	-echo ${SPREP} ${SPPC} | xargs ctags -wadtf ${TPREP}
+	-${FINDCOMM} | xargs ctags -wadtf ${TPREP}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} ${APPC} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TPREP}
 	sort -o ${TPREP} ${TPREP}
 
diff --git a/sys/arch/sandpoint/Makefile b/sys/arch/sandpoint/Makefile
index f33aae2e3def..24a5d99e7ef9 100644
--- a/sys/arch/sandpoint/Makefile
+++ b/sys/arch/sandpoint/Makefile
@@ -1,4 +1,32 @@
-#	$NetBSD: Makefile,v 1.3 2011/01/28 22:15:36 phx Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:47:50 dyoung Exp $
+
+.include <../powerpc/Makefile.inc>
+
+TSANDPOINT=	${SYSDIR}/arch/sandpoint/tags
+SSANDPOINT=	${SYSDIR}/arch/sandpoint/sandpoint/*.[ch] \
+		${SYSDIR}/arch/sandpoint/isa/*.[ch] \
+		${SYSDIR}/arch/sandpoint/pci/*.[ch] \
+		${SYSDIR}/arch/sandpoint/include/*.h
+ASANDPOINT=	${SYSDIR}/arch/sandpoint/sandpoint/*.S
+
+DSANDPOINT=	include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+	-rm -f ${TSANDPOINT}
+	-echo ${SSANDPOINT} ${SPPC} | xargs ctags -wadtf ${TSANDPOINT}
+	-${FINDCOMM} | xargs ctags -wadtf ${TSANDPOINT}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASANDPOINT} ${APPC} | \
+	    ${TOOL_SED} -e \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
+	    >> ${TSANDPOINT}
+	sort -o ${TSANDPOINT} ${TSANDPOINT}
+
+links:
+	-for i in ${DSANDPOINT}; do \
+	    cd $$i && rm -f tags; ln -s ../tags tags; done
+
 
 SUBDIR=	compile include stand