diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 679e9c75391..cdfaed0356e 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -43,9 +43,9 @@ CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 CFLAGS+=	-DLOADER_GELI_SUPPORT
-CFLAGS+=	-I${.CURDIR}/../../geli
+CFLAGS+=	-I${BOOTDIR}/geli
 CFLAGS+=	-I${.CURDIR}/../../..
-LIBGELIBOOT=	${.OBJDIR}/../../geli/libgeliboot.a
+LIBGELIBOOT=	${BOOTOBJ}/geli/libgeliboot.a
 .PATH:		${.CURDIR}/../../../opencrypto
 OPENCRYPTO_XTS=	xform_aes_xts.o
 .endif
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index e9de874a9d2..cd3d79e4d69 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -50,8 +50,8 @@ CFLAGS+=	-DSKEIN_LOOP=111
 
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 CFLAGS+=	-DLOADER_GELI_SUPPORT
-CFLAGS+=	-I${.CURDIR}/../../geli
-LIBGELIBOOT=	${.OBJDIR}/../../geli/libgeliboot.a
+CFLAGS+=	-I${BOOTDIR}/geli
+LIBGELIBOOT=	${BOOTOBJ}/geli/libgeliboot.a
 .PATH:		${.CURDIR}/../../../opencrypto
 OPENCRYPTO_XTS=	xform_aes_xts.o
 .endif
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 99cc2592af7..d53d387ef7a 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -28,7 +28,7 @@ CFLAGS+= -DDISK_DEBUG
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 # Decrypt encrypted drives
 CFLAGS+= -DLOADER_GELI_SUPPORT
-CFLAGS+= -I${.CURDIR}/../../geli
+CFLAGS+= -I${BOOTDIR}/geli
 .endif
 
 .if !defined(BOOT_HIDE_SERIAL_NUMBERS)
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 1f3046b9791..b626711f27e 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -42,8 +42,8 @@ HAVE_ISABUS=	yes
 
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 CFLAGS+=	-DLOADER_GELI_SUPPORT
-CFLAGS+=	-I${.CURDIR}/../../geli
-LIBGELIBOOT=	${.OBJDIR}/../../geli/libgeliboot.a
+CFLAGS+=	-I${BOOTDIR}/geli
+LIBGELIBOOT=	${BOOTOBJ}/geli/libgeliboot.a
 .PATH:		${.CURDIR}/../../../opencrypto
 SRCS+=		xform_aes_xts.c
 CFLAGS+=	-I${.CURDIR}/../../.. -D_STAND