diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64
index abecaa685022..6e8c967378cb 100644
--- a/stand/Makefile.amd64
+++ b/stand/Makefile.amd64
@@ -11,7 +11,7 @@ SUBDIR+=		ficl32
 SUBDIR+=		efi
 SUBDIR+=		userboot
 
-.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
+.if ${MK_LOADER_GELI} == "yes"
 SUBDIR+=		geli
 .endif
 
diff --git a/stand/Makefile.i386 b/stand/Makefile.i386
index fb53744ab5ae..966497496fd4 100644
--- a/stand/Makefile.i386
+++ b/stand/Makefile.i386
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
+.if ${MK_LOADER_GELI} == "yes"
 SUBDIR+=		geli
 .endif
 .if ${MK_ZFS} != "no"