diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 88e32995bbb..4f19de874ca 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -7,6 +7,9 @@ CLEANFILES=		softcore.c testmain testmain.o
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=		-mno-fp-regs
 .endif
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+=		-mpreferred-stack-boundary=2
+.endif
 .ifmake testmain
 CFLAGS+=			-DTESTMAIN -D_TESTMAIN
 SRCS+=				testmain.c
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index 4c20c10ac16..fa5ea569e60 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -3,3 +3,4 @@
 # $FreeBSD$
 
 LOADER_ADDRESS?=	0x200000
+CFLAGS+=		-mpreferred-stack-boundary=2