diff -r 99254c218e62 release/Makefile.vm
--- a/release/Makefile.vm	Thu Oct 06 18:48:38 2016 -0700
+++ b/release/Makefile.vm	Mon Oct 10 12:06:48 2016 -0700
@@ -8,6 +8,7 @@
 VMTARGETS=	vm-image
 VMFORMATS?=	vhd vmdk qcow2 raw
 VMSIZE?=	20G
+SWAPSIZE?=	1G
 VMBASE?=	vm
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image
diff -r 99254c218e62 release/tools/vmimage.subr
--- a/release/tools/vmimage.subr	Thu Oct 06 18:48:38 2016 -0700
+++ b/release/tools/vmimage.subr	Mon Oct 10 12:06:48 2016 -0700
@@ -11,7 +11,7 @@ trap "cleanup" INT QUIT TRAP ABRT TERM
 
 write_partition_layout() {
 	if [ -z "${NOSWAP}" ]; then
-		SWAPOPT="-p freebsd-swap/swapfs::1G"
+		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
 	fi
 
 	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"