diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index 4054bb1da9f2..ae32d878a3f4 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -1,68 +1,67 @@
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	yes
 LOADER_MSDOS_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_ZFS_SUPPORT?=	yes
 LOADER_NET_SUPPORT?=	no
 LOADER_NFS_SUPPORT?=	no
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
 .include <bsd.init.mk>
 
 PROG=		loader.kboot
 NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
 SRCS=	\
 		bootinfo.c \
 		conf.c \
 		gfx_fb_stub.c \
 		host_syscalls.c \
 		hostcons.c \
 		hostdisk.c \
 		hostfs.c \
 		init.c \
 		kbootfdt.c \
 		main.c \
 		seg.c \
 		termios.c \
 		util.c \
 		vers.c
 
 CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
 .if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
 HAVE_ZFS=yes
 .endif
 
 HELP_FILENAME=	loader.help.kboot
 
 .include	"${BOOTSRC}/fdt.mk"
 
 # We share bootinfo.c with efi
 .PATH:		${BOOTSRC}/efi/loader
 
 # Note: Since we're producing a userland binary, we key off of MACHINE_ARCH
 # instead of the more normal MACHINE since the changes between different flavors
 # of MACHINE_ARCH are large enough in Linux that it's easier that way.
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"
-.PATH:		${SYSDIR}/libkern
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 CFLAGS+=	-Wall
 
 DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
 LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
 
 .include <bsd.prog.mk>
diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
index c29e69970505..338d1222ab65 100644
--- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc
+++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
@@ -1,8 +1,7 @@
 CFLAGS+=	-mcpu=powerpc64
 
-SRCS+=		ppc64_elf_freebsd.c host_syscall.S kerneltramp.S load_addr.c fdt_arch.c
-SRCS+=		ucmpdi2.c
+SRCS+=		ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc
 
 MK_PIE=		no
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 415571617d2a..1b030ccfe018 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -1,10 +1,12 @@
 .include <bsd.init.mk>
 
 LIB=	kboot
 WARNS?= 4
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 SRCS=	crt1.c
 
+.sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+
 .include <bsd.lib.mk>
diff --git a/stand/kboot/libkboot/arch/powerpc64/Makefile.inc b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc
new file mode 100644
index 000000000000..4cafaee28847
--- /dev/null
+++ b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc
@@ -0,0 +1,4 @@
+CFLAGS+=	-mcpu=powerpc64
+
+.PATH:		${SYSDIR}/libkern
+SRCS+=		ucmpdi2.c