diff --git a/release/Makefile.vm b/release/Makefile.vm
index 72b150022ef7..cb44a34c4545 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -1,181 +1,181 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for building virtual machine and cloud provider disk images.
 #
 
 VMTARGETS=	vm-image
 VMFORMATS?=	vhd vmdk qcow2 raw
-VMSIZE?=	4096m
+VMSIZE?=	5120m
 SWAPSIZE?=	1g
 VMBASE?=	vm
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image
 VMDK_DESC=	VMWare, VirtualBox disk image
 QCOW2_DESC=	Qemu, KVM disk image
 RAW_DESC=	Unformatted raw disk image
 
 CLOUDWARE?=	BASIC-CI \
 		EC2 \
 		GCE \
 		VAGRANT-VIRTUALBOX \
 		VAGRANT-VMWARE
 AZURE_FORMAT=	vhdf
 AZURE_DESC=	Microsoft Azure platform image
 AZURE_DISK=	${OSRELEASE}.${AZURE_FORMAT}
 BASIC-CI_FORMAT=	raw
 BASIC-CI_DESC=		Image for CI
 BASIC-CI_DISK=	${OSRELEASE}.${BASIC-CI_FORMAT}
 EC2_FORMAT=	raw
 EC2_DESC=	Amazon EC2 image
 EC2_DISK=	${OSRELEASE}.${EC2_FORMAT}
 GCE_FORMAT=	raw
 GCE_DESC=	Google Compute Engine image
 GCE_DISK=	disk.${GCE_FORMAT}
 OPENSTACK_FORMAT=qcow2
 OPENSTACK_DESC=	OpenStack platform image
 OPENSTACK_DISK=	${OSRELEASE}.${OPENSTACK_FORMAT}
 VAGRANT-VIRTUALBOX_FORMAT=	vmdk
 VAGRANT-VIRTUALBOX_DESC=	Vagrant Image for VirtualBox
 VAGRANT-VIRTUALBOX_DISK=	${OSRELEASE}.vbox.${VAGRANT_FORMAT}
 VAGRANT-VMWARE_FORMAT=	vmdk
 VAGRANT-VMWARE_DESC=	Vagrant Image for VMWare
 VAGRANT-VMWARE_DISK=	${OSRELEASE}.vmware.${VAGRANT_FORMAT}
 
 .for _V in TYPE BRANCH REVISION
 . if !defined(${_V}) || empty(${_V})
 ${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
 . endif
 .endfor
 
 emulator-portinstall:
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
 .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
 .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
 	env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
 .else
 .if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
 .endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static
 .endif
 .endif
 
 QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static
 .endif
 .endif
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}
 CLOUDTARGETS+=	cw-${_CW:tl}
 CLEANDIRS+=	cw-${_CW:tl}
 CLEANFILES+=	${_CW:tl}.img \
 		${_CW:tl}.${${_CW:tu}_FORMAT} \
 		${_CW:tl}.${${_CW:tu}_FORMAT}.raw \
 		cw${_CW:tl}-package
 CLOUDPACKAGE+=	cw${_CW:tl}-package
 ${_CW:tu}IMAGE=	${_CW:tl}.${${_CW:tu}_FORMAT}
 .  if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
 ${_CW:tu}CONF?=	${.CURDIR}/tools/${_CW:tl}.conf
 .  endif
 
 cw-${_CW:tl}: emulator-portinstall
 	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
 		QEMUSTATIC=${QEMUSTATIC} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW:tu}CONF}
 	touch ${.TARGET}
 
 cw${_CW:tl}-package:
 	@# Special target to handle packaging cloud images in the formats
 	@# specific to each hosting provider.
 .if exists(${.CURDIR}/tools/${_CW:tl}-package.sh)
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/tools/${_CW:tl}-package.sh \
 		-D ${DESTDIR} -I ${${_CW}_DISK} -S ${WORLDDIR}
 .endif
 	touch ${.TARGET}
 
 . endfor
 .endif
 
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 CLEANDIRS+=	${VMTARGETS}
 . for FORMAT in ${VMFORMATS}
 CLEANFILES+=	${FORMAT}.img
 CLEANFILES+=	${VMBASE}.${FORMAT}
 . endfor
 .endif
 
 vm-base:	vm-image
 
 vm-image:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 . for FORMAT in ${VMFORMATS}
 	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT}
 . endfor
 .endif
 	touch ${.TARGET}
 
 vm-cloudware:	${CLOUDTARGETS}
 
 list-vmtargets:	list-cloudware
 	@${ECHO}
 	@${ECHO} "Supported virtual machine disk image formats:"
 .for FORMAT in ${VMFORMATS:tu}
 	@${ECHO} "  ${FORMAT:tl}: ${${FORMAT}_DESC}"
 .endfor
 
 list-cloudware:
 .if !empty(CLOUDWARE)
 	@${ECHO}
 	@${ECHO} "Supported cloud hosting provider images:"
 . for _CW in ${CLOUDWARE}
 	@${ECHO} "  ${_CW:tu}: ${${_CW:tu}_DESC}"
 . endfor
 .endif
 
 vm-install:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	mkdir -p ${DESTDIR}/vmimages
 . for FORMAT in ${VMFORMATS}
 	cp -p ${VMBASE}.${FORMAT} \
 		${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 . endfor
 . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
 .  for FORMAT in ${VMFORMATS}
 	# Don't keep the originals.  There is a copy in ${.OBJDIR} if needed.
 	${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 .  endfor
 . endif
 	cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA256
 .endif
 
 vm-release:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
 .endif
 
 cloudware-release:
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS}
 .endif
 
 .include "${.CURDIR}/Makefile.azure"
 .include "${.CURDIR}/Makefile.ec2"
 .include "${.CURDIR}/Makefile.gce"
 .include "${.CURDIR}/Makefile.vagrant"
 .include "${.CURDIR}/Makefile.inc1"
diff --git a/release/arm/GENERICSD.conf b/release/arm/GENERICSD.conf
index 22ca02b61139..32b780d04385 100644
--- a/release/arm/GENERICSD.conf
+++ b/release/arm/GENERICSD.conf
@@ -1,68 +1,68 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone sysutils/u-boot-rpi2 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
-IMAGE_SIZE="4096M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 BBB_UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
 RPI_UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
 RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 RPI_OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
 OVERLAYS="mmc.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="GENERICSD"
 
 arm_install_uboot_rpi2() {
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
 		start.elf start_cd.elf start_db.elf start_x.elf \
 		bcm2709-rpi-2-b.dtb"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
 
 arm_install_uboot_bbb() {
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 
 	return 0
 }
 
 arm_install_uboot() {
 	arm_install_uboot_bbb
 	arm_install_uboot_rpi2
 }
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index f164edd25b90..5c70339bd63a 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -1,50 +1,50 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware"
 FAT_SIZE="50m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="RPI-B"
 MD_ARGS="-x 63 -y 255"
 UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
 RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
 OVERLAYS="mmc.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="RPI-B"
 
 arm_install_uboot() {
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
 		start.elf start_cd.elf start_db.elf start_x.elf \
 		bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
 		bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
diff --git a/release/arm64/PINE64-LTS.conf b/release/arm64/PINE64-LTS.conf
index fa4ab6fd5302..9b114d05416d 100644
--- a/release/arm64/PINE64-LTS.conf
+++ b/release/arm64/PINE64-LTS.conf
@@ -1,26 +1,26 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-pine64-lts"
 FAT_SIZE="54m -b 1m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 FDT_OVERLAYS="sun50i-a64-timer"
 export BOARDNAME="PINE64-LTS"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64-lts"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=128k seek=1 conv=sync
 	
 	return 0
 }
diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index c5aa86fc8160..2d1ad43aeba4 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -1,26 +1,26 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-pine64"
 FAT_SIZE="54m -b 1m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 FDT_OVERLAYS="sun50i-a64-timer"
 export BOARDNAME="PINE64"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=128k seek=1 conv=sync
 	
 	return 0
 }
diff --git a/release/arm64/PINEBOOK.conf b/release/arm64/PINEBOOK.conf
index 17e287bc55ad..8bf7c153d869 100644
--- a/release/arm64/PINEBOOK.conf
+++ b/release/arm64/PINEBOOK.conf
@@ -1,41 +1,41 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-pinebook"
 FAT_SIZE="54m -b 1m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 FDT_OVERLAYS="sun50i-a64-timer"
 export BOARDNAME="PINEBOOK"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pinebook"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=128k seek=1 conv=sync
 
 	return 0
 }
 
 arm_do_quirk() {
 	echo '# Enable quirk for trackpad' \
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	echo 'usb_quirk_load=YES' \
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	echo 'ums_load=YES' \
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	echo 'hw.usb.quirk="0x258a 0x000c 0x0000 0xffff UQ_CFG_INDEX=1"' \
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	# We want EFIFB but there is no node and so we cannot know
 	# which regulator is used for powering lcd/hdmi
 	echo 'hw.regulator.disable_unused=0' \
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 }
diff --git a/release/arm64/ROCK64.conf b/release/arm64/ROCK64.conf
index e77930b73661..2eb50484a378 100644
--- a/release/arm64/ROCK64.conf
+++ b/release/arm64/ROCK64.conf
@@ -1,27 +1,27 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rock64"
 FAT_SIZE="50m -b 16m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 export BOARDNAME="ROCK64"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rock64"
 	UBOOT_FILE_1="idbloader.img"
 	UBOOT_FILE_2="u-boot.itb"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILE_1} \
 		of=/dev/${mddev} bs=512 seek=64 conv=sync
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILE_2} \
 		of=/dev/${mddev} bs=512 seek=16384 conv=sync
 	return 0
 }
diff --git a/release/arm64/ROCKPRO64.conf b/release/arm64/ROCKPRO64.conf
index e09c3a8b491f..9a3b17836b67 100644
--- a/release/arm64/ROCKPRO64.conf
+++ b/release/arm64/ROCKPRO64.conf
@@ -1,27 +1,27 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rockpro64"
 FAT_SIZE="50m -b 16m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 export BOARDNAME="ROCKPRO64"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rockpro64"
 	UBOOT_FILE_1="idbloader.img"
 	UBOOT_FILE_2="u-boot.itb"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILE_1} \
 		of=/dev/${mddev} bs=512 seek=64 conv=sync
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILE_2} \
 		of=/dev/${mddev} bs=512 seek=16384 conv=sync
 	return 0
 }
diff --git a/release/arm64/RPI.conf b/release/arm64/RPI.conf
index bce6236fbfae..b4a7773f41f3 100644
--- a/release/arm64/RPI.conf
+++ b/release/arm64/RPI.conf
@@ -1,54 +1,54 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 DTB_DIR="/usr/local/share/rpi-firmware"
 DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-rpi-arm64 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
-IMAGE_SIZE="3072M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 OL_DIR="${DTB_DIR}/overlays"
 OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="RPI"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi-arm64"
 	UBOOT_FILES="README u-boot.bin"
 	DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
 		fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
 		start_cd.elf start_db.elf start_x.elf start.elf \
 		fixup4.dat fixup4cd.dat fixup4db.dat fixup4x.dat start4.elf \
 		start4cd.elf start4db.elf start4x.elf ${DTB}"
 	FATMOUNT="${DESTDIR%${KERNEL}}fat"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
 	for _DF in ${DTB_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
 			${FATMOUNT}/${_DF}
 	done
 	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_arm64.txt \
 			${FATMOUNT}/config.txt
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
 		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
 			${FATMOUNT}/overlays/${_OL}
 	done
 
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
 	
 	return 0
 }
diff --git a/release/riscv/GENERICSD.conf b/release/riscv/GENERICSD.conf
index e969914dabe5..057babf769c1 100644
--- a/release/riscv/GENERICSD.conf
+++ b/release/riscv/GENERICSD.conf
@@ -1,15 +1,15 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 EMBEDDED_TARGET_ARCH="riscv64"
 EMBEDDED_TARGET="riscv"
 EMBEDDEDBUILD=1
 FAT_SIZE="54m -b 8m"
 FAT_TYPE="16"
-IMAGE_SIZE="4096M"
+IMAGE_SIZE="5120M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 PART_SCHEME="GPT"
 export BOARDNAME="GENERICSD"