diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile
index 2e0b9d7a2e0..72dbabc0056 100644
--- a/stand/kboot/Makefile
+++ b/stand/kboot/Makefile
@@ -2,6 +2,6 @@ NO_OBJ=t
 
 .include <bsd.init.mk>
 
-SUBDIR+=	kboot
+SUBDIR+=	libkboot .WAIT kboot
 
 .include <bsd.subdir.mk>
diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc
index 01b5f23410c..02aecdad55f 100644
--- a/stand/kboot/Makefile.inc
+++ b/stand/kboot/Makefile.inc
@@ -1 +1,7 @@
+# Bring in the mini-libc that we wrote
+
+KBOOTSRC=${BOOTSRC}/kboot
+CFLAGS+=-I${KBOOTSRC}/include
+LIBKBOOT=${BOOTOBJ}/kboot/libkboot/libkboot.a
+
 .include "../Makefile.inc"
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index b9d68cddf97..4054bb1da9f 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -21,7 +21,6 @@ INSTALLFLAGS=	-b
 SRCS=	\
 		bootinfo.c \
 		conf.c \
-		crt1.c \
 		gfx_fb_stub.c \
 		host_syscalls.c \
 		hostcons.c \
@@ -63,7 +62,7 @@ CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 CFLAGS+=	-Wall
 
-DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
-LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
+LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
 
 .include <bsd.prog.mk>
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
new file mode 100644
index 00000000000..415571617d2
--- /dev/null
+++ b/stand/kboot/libkboot/Makefile
@@ -0,0 +1,10 @@
+.include <bsd.init.mk>
+
+LIB=	kboot
+WARNS?= 4
+
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
+
+SRCS=	crt1.c
+
+.include <bsd.lib.mk>
diff --git a/stand/kboot/kboot/arch/aarch64/start_arch.h b/stand/kboot/libkboot/arch/aarch64/start_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/start_arch.h
rename to stand/kboot/libkboot/arch/aarch64/start_arch.h
diff --git a/stand/kboot/kboot/arch/amd64/start_arch.h b/stand/kboot/libkboot/arch/amd64/start_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/start_arch.h
rename to stand/kboot/libkboot/arch/amd64/start_arch.h
diff --git a/stand/kboot/kboot/arch/powerpc64/start_arch.h b/stand/kboot/libkboot/arch/powerpc64/start_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/start_arch.h
rename to stand/kboot/libkboot/arch/powerpc64/start_arch.h
diff --git a/stand/kboot/kboot/crt1.c b/stand/kboot/libkboot/crt1.c
similarity index 100%
rename from stand/kboot/kboot/crt1.c
rename to stand/kboot/libkboot/crt1.c