diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 7bd4c6301178..6bfa593b7144 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -1,26 +1,27 @@
 # $FreeBSD$
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
 # below.  Note, there are no IDs for syscall stubs whose sources are generated.
 # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 LIB=thr
 SHLIB_MAJOR= 1
 DEBUG_FLAGS=-g
 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
 
 # enable extra internal consistancy checks
 CFLAGS+=-D_PTHREADS_INVARIANTS
 
 AINC=	-I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread
 PRECIOUSLIB=	yes
 
 .include "${.CURDIR}/thread/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
 .include <bsd.lib.mk>
diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/arch/i386/Makefile.inc
similarity index 63%
copy from lib/libthr/sys/Makefile.inc
copy to lib/libthr/arch/i386/Makefile.inc
index d27eeb8593ed..0c86284b8046 100644
--- a/lib/libthr/sys/Makefile.inc
+++ b/lib/libthr/arch/i386/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+=	thr_error.c _curthread.S _setcurthread.c
+SRCS+=	_setcurthread.c _curthread.S
diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc
index d27eeb8593ed..59018f7065ad 100644
--- a/lib/libthr/sys/Makefile.inc
+++ b/lib/libthr/sys/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+=	thr_error.c _curthread.S _setcurthread.c
+SRCS+=	thr_error.c