diff --git a/sys/Makefile b/sys/Makefile
index 04557563905b..37c759547fe6 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -12,9 +12,12 @@ CSCOPEDIRS=	boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \
 		gnu isa kern libkern modules net net80211 netatalk \
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
 		netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \
-		pci rpc security sys ufs vm ${ARCHDIR}
-
-ARCHDIR	?=	${MACHINE}
+		pci rpc security sys ufs vm ${CSCOPE_ARCHDIR}
+.if defined(ALL_ARCH)
+CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips powerpc sparc64
+.else
+CSCOPE_ARCHDIR ?= ${MACHINE}
+.endif
 
 # Loadable kernel modules