2 files changed, 29 insertions, 26 deletions

diff --git a/sys/boot/forth/Makefile b/sys/boot/forth/Makefile
index 1f42003f9dcb..a0a55864fa5b 100644
--- a/sys/boot/forth/Makefile
+++ b/sys/boot/forth/Makefile
@@ -11,4 +11,33 @@ MAN+=	beastie.4th.8 \
 	menusets.4th.8 \
 	version.4th.8
 
+FILES+=	beastie.4th
+FILES+=	brand.4th
+FILES+=	brand-fbsd.4th
+FILES+=	check-password.4th
+FILES+=	color.4th
+FILES+=	delay.4th
+FILES+=	efi.4th
+FILES+=	frames.4th
+FILES+=	loader.4th
+FILES+=	loader.conf
+FILES+=	logo-beastie.4th
+FILES+=	logo-beastiebw.4th
+FILES+=	logo-fbsdbw.4th
+FILES+=	logo-orb.4th
+FILES+=	logo-orbbw.4th
+FILES+=	menu.4th
+FILES+=	menu-commands.4th
+FILES+=	menusets.4th
+FILES+=	pcibios.4th
+FILES+=	screen.4th
+FILES+=	shortcuts.4th
+FILES+=	support.4th
+FILES+=	version.4th
+FILESDIR_loader.conf=	/boot/defaults
+
+# Everybody has these, but you can override
+.PATH:	${BOOTSRC}/${MACHINE:C/amd64/i386/}/common ${BOOTSRC}/forth
+FILES+= loader.rc menu.rc
+
 .include <bsd.prog.mk>
diff --git a/sys/boot/forth/Makefile.inc b/sys/boot/forth/Makefile.inc
deleted file mode 100644
index d31ff3f26291..000000000000
--- a/sys/boot/forth/Makefile.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-FILES+=	beastie.4th
-FILES+=	brand.4th
-FILES+=	brand-fbsd.4th
-FILES+=	check-password.4th
-FILES+=	color.4th
-FILES+=	delay.4th
-FILES+=	efi.4th
-FILES+=	frames.4th
-FILES+=	loader.4th
-FILES+=	loader.conf
-FILES+=	loader.help
-FILES+=	logo-beastie.4th
-FILES+=	logo-beastiebw.4th
-FILES+=	logo-fbsdbw.4th
-FILES+=	logo-orb.4th
-FILES+=	logo-orbbw.4th
-FILES+=	menu.4th
-FILES+=	menu-commands.4th
-FILES+=	menusets.4th
-FILES+=	screen.4th
-FILES+=	shortcuts.4th
-FILES+=	support.4th
-FILES+=	version.4th
-FILESDIR_loader.conf=	/boot/defaults