diff --git a/sysutils/u-boot-bhyve-arm64/Makefile b/sysutils/u-boot-bhyve-arm64/Makefile
index 380254843ab6..1d4ccde6a4db 100644
--- a/sysutils/u-boot-bhyve-arm64/Makefile
+++ b/sysutils/u-boot-bhyve-arm64/Makefile
@@ -1,12 +1,14 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2023.10=	1
+
 MODEL=		bhyve-arm64
 BOARD_CONFIG=	bhyve_arm64_defconfig
 FAMILY=		bhyve
 UBOOT_ARCH=	aarch64
 
 UBOOT_PLIST=	u-boot.bin
 
 EXTRA_PATCHES=	${.CURDIR}/files/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c b/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
index 9cf46325cc08..38ef6709ffcb 100644
--- a/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
+++ b/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
@@ -1,102 +1,102 @@
 --- board/emulation/bhyve-arm/bhyve-arm.c.orig	2023-11-01 18:14:48 UTC
 +++ board/emulation/bhyve-arm/bhyve-arm.c
 @@ -0,0 +1,99 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Copyright (c) 2017 Tuomas Tynkkynen
 + */
 +
 +#include <common.h>
 +#include <dm.h>
 +#include <fdtdec.h>
 +#include <virtio.h>
 +
 +#include <asm/armv8/mmu.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
 +static struct mm_region bhyve_arm64_mem_map[] = {
 +	{
 +		/* Peripherals */
 +		.virt = 0x10000UL,
 +		.phys = 0x10000UL,
 +		.size = 0x1000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 +	}, {
 +		/* GICv3 */
 +		.virt = 0x2f000000UL,
 +		.phys = 0x2f000000UL,
 +		.size = 0x10000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 +	}, {
 +		/* GICv3 */
 +		.virt = 0x2f100000UL,
 +		.phys = 0x2f100000UL,
-+		.size = 0x20000UL,
++		.size = 0xf00000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 +	}, {
 +		/* PCI */
 +		.virt = 0xa0000000UL,
 +		.phys = 0xa0000000UL,
 +		.size = 0x50000000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 +	}, {
 +		/* RAM */
 +		.virt = 0x100000000UL,
 +		.phys = 0x100000000UL,
 +		.size = 252UL * SZ_1G,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
 +			 PTE_BLOCK_INNER_SHARE
 +	}, {
 +		/* List terminator */
 +		0,
 +	}
 +};
 +
 +struct mm_region *mem_map = bhyve_arm64_mem_map;
 +
 +int board_init(void)
 +{
 +	return 0;
 +}
 +
 +int board_late_init(void)
 +{
 +	/*
 +	 * Make sure virtio bus is enumerated so that peripherals
 +	 * on the virtio bus can be discovered by their drivers
 +	 */
 +	virtio_init();
 +
 +	return 0;
 +}
 +
 +int dram_init(void)
 +{
 +	if (fdtdec_setup_mem_size_base() != 0)
 +		return -EINVAL;
 +
 +	return 0;
 +}
 +
 +int dram_init_banksize(void)
 +{
 +	fdtdec_setup_memory_banksize();
 +
 +	return 0;
 +}
 +
 +void *board_fdt_blob_setup(int *err)
 +{
 +	*err = 0;
 +	/* XXX: Pass in the address from the host */
 +	return (void *)0x100100000;
 +}