diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc
index 50388d38dbf2..744a15f363d3 100644
--- a/stand/kboot/kboot/arch/aarch64/Makefile.inc
+++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc
@@ -1,12 +1,12 @@
-SRCS+=		host_syscall.S tramp.S exec.c load_addr.c fdt_arch.c
+SRCS+=		tramp.S exec.c load_addr.c fdt_arch.c
 
 .PATH:	${BOOTSRC}/arm64/libarm64
 CFLAGS+=-I${BOOTSRC}/arm64/libarm64
 SRCS+=	cache.c
 
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
 # load address. set in linker script
 RELOC?=		0x0
 CFLAGS+=	-DRELOC=${RELOC}
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc
index fdd40fe9bc5a..55b1819ccdee 100644
--- a/stand/kboot/kboot/arch/amd64/Makefile.inc
+++ b/stand/kboot/kboot/arch/amd64/Makefile.inc
@@ -1,5 +1,5 @@
-SRCS+=		host_syscall.S amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
+SRCS+=		amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
 
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.amd64
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 1b030ccfe018..31f4827e64b9 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -1,12 +1,14 @@
 .include <bsd.init.mk>
 
 LIB=	kboot
 WARNS?= 4
 
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
-SRCS=	crt1.c
+SRCS=	crt1.c \
+	host_syscall.S
 
 .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
 .include <bsd.lib.mk>
diff --git a/stand/kboot/kboot/arch/aarch64/host_syscall.S b/stand/kboot/libkboot/arch/aarch64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/host_syscall.S
rename to stand/kboot/libkboot/arch/aarch64/host_syscall.S
diff --git a/stand/kboot/kboot/arch/amd64/host_syscall.S b/stand/kboot/libkboot/arch/amd64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/host_syscall.S
rename to stand/kboot/libkboot/arch/amd64/host_syscall.S
diff --git a/stand/kboot/kboot/arch/powerpc64/host_syscall.S b/stand/kboot/libkboot/arch/powerpc64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/host_syscall.S
rename to stand/kboot/libkboot/arch/powerpc64/host_syscall.S