diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index d19e3ae7f2..77c2d536c9 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -653,6 +653,8 @@ _write_qemu_uefi_conf() {
             cp "/usr/share/edk2-ovmf/OVMF_VARS.fd" "$(_dst_dir)/${flash_rw}"
             ;;
         arm64-usr)
+            info "Updating edk2-armvirt in /build/${BOARD}"
+            emerge-${BOARD} --nodeps --select -qugKN sys-firmware/edk2-armvirt
             # this bit of magic comes from http://tech.donghao.org/2014/12/18/running-fedora-21-on-qemu-system-aarch64/
             cat "/build/${BOARD}/usr/share/edk2-armvirt/QEMU_EFI.fd" /dev/zero | \
                 dd iflag=fullblock bs=1M count=64 of="$(_dst_dir)/${flash_ro}"