diff --git a/sys/arch/sparc64/Makefile b/sys/arch/sparc64/Makefile
index 8552041fe8ea..9832b8f63fe8 100644
--- a/sys/arch/sparc64/Makefile
+++ b/sys/arch/sparc64/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.13 2003/01/06 17:40:51 lukem Exp $
+#	$NetBSD: Makefile,v 1.14 2007/06/08 22:59:51 dyoung Exp $
 
 # Makefile for sparc64 tags file and boot blocks
 
-TSPARC64=	../sparc64/tags
-SSPARC64=	../sparc64/dev/*.[ch] ../sparc/fpu/*.[ch] \
-	../sparc64/include/*.[ch] ../sparc64/sparc64/*.[ch]
-ASPARC64=	../sparc64/sparc64/*.s
+TSPARC64=	${SYSDIR}/arch/sparc64/tags
+SSPARC64=	${SYSDIR}/arch/sparc64/dev/*.[ch] \
+		${SYSDIR}/arch/sparc/fpu/*.[ch] \
+		${SYSDIR}/arch/sparc64/include/*.[ch] \
+		${SYSDIR}/arch/sparc64/sparc64/*.[ch]
+ASPARC64=	${SYSDIR}/arch/sparc64/sparc64/*.[sS]
 # CSPARC64=	../../compat/*/*.[ch]
 
 # Directories in which to place tags links
@@ -14,7 +16,8 @@ DSPARC64=	conf dev fpu include sparc64
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TSPARC64} ${SSPARC64} ${COMM}
+	-rm ${TSPARC64}
+	-echo ${SSPARC64} ${COMM} | xargs ctags -wadtf ${TSPARC64}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC64} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 	    >> tags