diff --git a/stand/Makefile b/stand/Makefile
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -39,6 +39,9 @@
 .include <bsd.arch.inc.mk>
 
 S.${MK_EFI}+=		efi
+.if ${MK_FDT} != "no"
+S.${MK_LOADER_KBOOT}+=	kboot
+.endif
 S.${MK_LOADER_UBOOT}+=	uboot
 
 .if defined(LIB32LIST)
diff --git a/stand/powerpc/kboot/Makefile b/stand/kboot/Makefile
rename from stand/powerpc/kboot/Makefile
rename to stand/kboot/Makefile
diff --git a/stand/powerpc/kboot/conf.c b/stand/kboot/conf.c
rename from stand/powerpc/kboot/conf.c
rename to stand/kboot/conf.c
diff --git a/stand/powerpc/kboot/host_syscall.h b/stand/kboot/host_syscall.h
rename from stand/powerpc/kboot/host_syscall.h
rename to stand/kboot/host_syscall.h
diff --git a/stand/powerpc/kboot/host_syscall.S b/stand/kboot/host_syscall.S
rename from stand/powerpc/kboot/host_syscall.S
rename to stand/kboot/host_syscall.S
diff --git a/stand/powerpc/kboot/hostcons.c b/stand/kboot/hostcons.c
rename from stand/powerpc/kboot/hostcons.c
rename to stand/kboot/hostcons.c
diff --git a/stand/powerpc/kboot/hostdisk.c b/stand/kboot/hostdisk.c
rename from stand/powerpc/kboot/hostdisk.c
rename to stand/kboot/hostdisk.c
diff --git a/stand/powerpc/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c
rename from stand/powerpc/kboot/kbootfdt.c
rename to stand/kboot/kbootfdt.c
diff --git a/stand/powerpc/kboot/kerneltramp.S b/stand/kboot/kerneltramp.S
rename from stand/powerpc/kboot/kerneltramp.S
rename to stand/kboot/kerneltramp.S
diff --git a/stand/powerpc/kboot/ldscript.powerpc b/stand/kboot/ldscript.powerpc
rename from stand/powerpc/kboot/ldscript.powerpc
rename to stand/kboot/ldscript.powerpc
diff --git a/stand/powerpc/kboot/main.c b/stand/kboot/main.c
rename from stand/powerpc/kboot/main.c
rename to stand/kboot/main.c
diff --git a/stand/powerpc/kboot/ppc64_elf_freebsd.c b/stand/kboot/ppc64_elf_freebsd.c
rename from stand/powerpc/kboot/ppc64_elf_freebsd.c
rename to stand/kboot/ppc64_elf_freebsd.c
diff --git a/stand/powerpc/kboot/version b/stand/kboot/version
rename from stand/powerpc/kboot/version
rename to stand/kboot/version
diff --git a/stand/powerpc/Makefile b/stand/powerpc/Makefile
--- a/stand/powerpc/Makefile
+++ b/stand/powerpc/Makefile
@@ -6,8 +6,4 @@
 
 SUBDIR.yes=		boot1.chrp ofw
 
-.if "${MACHINE_ARCH}" == "powerpc64"
-SUBDIR.${MK_FDT}+=	kboot
-.endif
-
 .include <bsd.subdir.mk>