diff --git a/distrib/amd64/liveimage/Makefile.liveimage b/distrib/amd64/liveimage/Makefile.liveimage
index face75fdb4e9..0c89491dc1d9 100644
--- a/distrib/amd64/liveimage/Makefile.liveimage
+++ b/distrib/amd64/liveimage/Makefile.liveimage
@@ -6,7 +6,10 @@ KERN_SET=		kern-GENERIC
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot
 SECONDARY_BOOT_ARG=	# unnecessary
+EFIBOOT=		${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+=		${WORKDIR}/usr/mdec/bootia32.efi
 
 USE_MBR=		yes
+USE_GPT=		yes
 
 .include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
diff --git a/distrib/amd64/liveimage/emuimage/Makefile b/distrib/amd64/liveimage/emuimage/Makefile
index 190ea87487f8..1be83d1c9935 100644
--- a/distrib/amd64/liveimage/emuimage/Makefile
+++ b/distrib/amd64/liveimage/emuimage/Makefile
@@ -2,7 +2,7 @@
 
 LIVEIMGBASE=	NetBSD-${DISTRIBVER}-amd64-live	# gives ${IMGBASE}.img
 
-EMUIMAGEMB?=	1536            	# 2GB USB flash memories aren't 2GiB
+EMUIMAGEMB?=	2000            	# 2GB USB flash memories aren't 2GiB
 LIVEIMAGEMB=	${EMUIMAGEMB}
 
 .include "${.CURDIR}/../Makefile.liveimage"