diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index 85467a6a6ab9..ac473a89adb0 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -10,15 +10,17 @@ SRCS+=		main.c conf.c
 SRCS+=		dev_net.c
 .endif
 
+.if !defined(NOFORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha
 CFLAGS+=	-DBOOT_FORTH
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .else
 LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
+.endif
 
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index 58818292b58e..e2f9a84ea786 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -12,18 +12,17 @@ STRIP=		# We must not strip loader.efi at install time.
 SRCS+=		main.c conf.c dev_net.c
 
 CFLAGS+=	-ffreestanding
+
+.if !defined(NOFORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
-.if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .else
 LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
-.else
-LIBFICL=
 .endif
 
 # where to get libstand from
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 58818292b58e..e2f9a84ea786 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -12,18 +12,17 @@ STRIP=		# We must not strip loader.efi at install time.
 SRCS+=		main.c conf.c dev_net.c
 
 CFLAGS+=	-ffreestanding
+
+.if !defined(NOFORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
-.if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .else
 LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
-.else
-LIBFICL=
 .endif
 
 # where to get libstand from
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index bb4fc5cfcc80..8a374a177eb6 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -9,20 +9,18 @@ BINDIR?=	/boot
 
 SRCS+=		main.c conf.c
 
+CFLAGS+=	-ffreestanding
+
+.if !defined(NOFORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-ffreestanding
-CFLAGS+=	-g
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64
-.if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .else
 LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
-.else
-LIBFICL=
 .endif
 
 # where to get libstand from
diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile
index bb4fc5cfcc80..8a374a177eb6 100644
--- a/sys/boot/ia64/skiload/Makefile
+++ b/sys/boot/ia64/skiload/Makefile
@@ -9,20 +9,18 @@ BINDIR?=	/boot
 
 SRCS+=		main.c conf.c
 
+CFLAGS+=	-ffreestanding
+
+.if !defined(NOFORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-ffreestanding
-CFLAGS+=	-g
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64
-.if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .else
 LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
-.else
-LIBFICL=
 .endif
 
 # where to get libstand from