Index: head/stand/Makefile.amd64
===================================================================
--- head/stand/Makefile.amd64	(revision 326503)
+++ head/stand/Makefile.amd64	(revision 326504)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 SUBDIR+=		libsa32
 .if ${MK_ZFS} != "no"
 SUBDIR+=		zfs zfs32
 .endif
 .if ${MK_FORTH} != "no"
 SUBDIR+=		ficl32
 .endif
 
 SUBDIR+=		efi
 SUBDIR+=		userboot
 
-.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
+.if ${MK_LOADER_GELI} == "yes"
 SUBDIR+=		geli
 .endif
 
 SUBDIR+=		i386
Index: head/stand/Makefile.i386
===================================================================
--- head/stand/Makefile.i386	(revision 326503)
+++ head/stand/Makefile.i386	(revision 326504)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
+.if ${MK_LOADER_GELI} == "yes"
 SUBDIR+=		geli
 .endif
 .if ${MK_ZFS} != "no"
 SUBDIR+=		zfs
 .endif
 
 SUBDIR+=		efi