Index: sys/boot/userboot/userboot/Makefile
===================================================================
--- sys/boot/userboot/userboot/Makefile	(revision 320623)
+++ sys/boot/userboot/userboot/Makefile	(working copy)
@@ -56,12 +56,21 @@
 LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
 .endif
 
+.if !defined(LOADER_NO_GELI_SUPPORT)
+CFLAGS+=        -DLOADER_GELI_SUPPORT
+CFLAGS+=        -I${.CURDIR}/../../geli
+LIBGELIBOOT=    ${.OBJDIR}/../../geli/libgeliboot.a
+.PATH:          ${.CURDIR}/../../../opencrypto
+SRCS+=          xform_aes_xts.c
+CFLAGS+=        -I${.CURDIR}/../../.. -D_STAND
+.endif
+
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
-LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
+DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} ${LIBGELIBOOT}
+LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} ${LIBGELIBOOT}
 
 .include <bsd.lib.mk>