diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 8cb5dd310b7b..2e6098f948dc 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -28,7 +28,7 @@ ORG1=	0x7c00
 ORG2=	0x1000
 
 CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
-	-fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels \
+	-fno-guess-branch-probability \
 	-mrtd \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 8cb5dd310b7b..2e6098f948dc 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -28,7 +28,7 @@ ORG1=	0x7c00
 ORG2=	0x1000
 
 CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
-	-fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels \
+	-fno-guess-branch-probability \
 	-mrtd \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \