diff --git a/stand/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c
index c4555c7a323d..5553364090f1 100644
--- a/stand/i386/gptboot/gptboot.c
+++ b/stand/i386/gptboot/gptboot.c
@@ -490,9 +490,10 @@ load(void)
 #endif
 	__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
 	    MAKEBOOTDEV(dev_maj[gdsk.dsk.type], gdsk.dsk.part + 1, gdsk.dsk.unit, 0xff),
-	    KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo)
 #ifdef LOADER_GELI_SUPPORT
-	    , geliargs
+	    KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo), geliargs
+#else
+	    0, 0, 0, VTOP(&bootinfo)
 #endif
 	    );
 }
diff --git a/stand/i386/isoboot/isoboot.c b/stand/i386/isoboot/isoboot.c
index 0505db6b927c..f7da4c7d3101 100644
--- a/stand/i386/isoboot/isoboot.c
+++ b/stand/i386/isoboot/isoboot.c
@@ -417,7 +417,7 @@ load(void)
 	bootinfo.bi_bios_dev = dsk.drive;
 	__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
 	    MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.unit, 0),
-	    KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo));
+	    0, 0, 0, VTOP(&bootinfo));
 }
 
 static int