diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index c4e2b5abc21a..9a7aa1281b58 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -15,10 +15,10 @@ SHLIB_MAJOR= 4
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
-CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include
+CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
 CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH}
+CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
 CFLAGS+=-fno-builtin
 
 # Uncomment this if you want libkse to contain debug information for
@@ -38,7 +38,9 @@ SYMBOL_MAPS=${.CURDIR}/kse.map
 
 PRECIOUSLIB=
 
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.path: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
+
+.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
 .include "${.CURDIR}/support/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
diff --git a/lib/libkse/arch/amd64/Makefile.inc b/lib/libkse/arch/amd64/Makefile.inc
index c8b0362bca85..0166d3d078d4 100644
--- a/lib/libkse/arch/amd64/Makefile.inc
+++ b/lib/libkse/arch/amd64/Makefile.inc
@@ -1,5 +1,3 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 SRCS+=	context.S enter_uts.S pthread_md.c
diff --git a/lib/libkse/arch/arm/Makefile.inc b/lib/libkse/arch/arm/Makefile.inc
index ced7063106e1..1705e7149d55 100644
--- a/lib/libkse/arch/arm/Makefile.inc
+++ b/lib/libkse/arch/arm/Makefile.inc
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 CFLAGS+=-DSYSTEM_SCOPE_ONLY
 
 SRCS+=	pthread_md.c context.S
diff --git a/lib/libkse/arch/i386/Makefile.inc b/lib/libkse/arch/i386/Makefile.inc
index 73a9a8acde45..b83ca286b2b1 100644
--- a/lib/libkse/arch/i386/Makefile.inc
+++ b/lib/libkse/arch/i386/Makefile.inc
@@ -1,5 +1,3 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 SRCS+=	thr_enter_uts.S thr_getcontext.S pthread_md.c
diff --git a/lib/libkse/arch/ia64/Makefile.inc b/lib/libkse/arch/ia64/Makefile.inc
index c8b0362bca85..0166d3d078d4 100644
--- a/lib/libkse/arch/ia64/Makefile.inc
+++ b/lib/libkse/arch/ia64/Makefile.inc
@@ -1,5 +1,3 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 SRCS+=	context.S enter_uts.S pthread_md.c
diff --git a/lib/libkse/arch/powerpc/Makefile.inc b/lib/libkse/arch/powerpc/Makefile.inc
index f4417a6ceb87..f49e97fdc299 100644
--- a/lib/libkse/arch/powerpc/Makefile.inc
+++ b/lib/libkse/arch/powerpc/Makefile.inc
@@ -3,6 +3,4 @@
 # XXX temporary
 CFLAGS+=-DSYSTEM_SCOPE_ONLY
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 SRCS+=	enter_uts.S context.S pthread_md.c
diff --git a/lib/libkse/arch/sparc64/Makefile.inc b/lib/libkse/arch/sparc64/Makefile.inc
index 07107b4729af..988ff06b0869 100644
--- a/lib/libkse/arch/sparc64/Makefile.inc
+++ b/lib/libkse/arch/sparc64/Makefile.inc
@@ -1,5 +1,3 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
 SRCS+=	pthread_md.c thr_getcontext.S
diff --git a/lib/libkse/support/Makefile.inc b/lib/libkse/support/Makefile.inc
index 956667fdef7d..6542f7ac9a7d 100644
--- a/lib/libkse/support/Makefile.inc
+++ b/lib/libkse/support/Makefile.inc
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
+.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
 
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
 
 SYSCALLS= clock_gettime \
 	kse_create \