diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile
index 39b56f725127..ef25cd7a87f5 100644
--- a/sysutils/xen-guest-tools/Makefile
+++ b/sysutils/xen-guest-tools/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	xen-guest-tools
-PORTVERSION=	4.16.1
-PORTREVISION=	2
+PORTVERSION=	4.20.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.xenproject.org/release/xen/${PORTVERSION}/
 DISTNAME=	xen-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xen tools within FreeBSD domU
 WWW=		https://xenproject.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64 or i386
 CONFLICTS=	xen-tools
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
 		${LOCALBASE}/lib/libargp.so:devel/argp-standalone \
 		${LOCALBASE}/lib/libyajl.so:devel/yajl \
 		${LOCALBASE}/lib/liblzo2.so:archivers/lzo2
 
 USES=		bison gmake pkgconfig perl5 python:build \
 		gettext-runtime:build gettext-tools:build
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-xen
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD}
 CONFIGURE_ENV+=	APPEND_LIB="${LOCALBASE}/lib"
 CONFIGURE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	IASL="/usr/sbin/iasl"
 MAKE_ENV+=	clang=y
 MAKE_ENV+=	CC="${CC}"
 MAKE_ENV+=	CFLAGS="${CFLAGS}"
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 MAKE_ENV+=	FREEBSD_PORT=y
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/xen-detect \
 		bin/xenstore \
 		bin/xenstore-chmod \
 		bin/xenstore-control \
 		bin/xenstore-exists \
 		bin/xenstore-list \
 		bin/xenstore-ls \
 		bin/xenstore-read \
 		bin/xenstore-rm \
 		bin/xenstore-watch \
 		bin/xenstore-write \
 		lib/libxenstore.so.4.0 \
 		lib/libxenstore.so.4 \
 		lib/libxentoolcore.so.1.0 \
 		lib/libxentoolcore.so.1
 
 post-patch:
 	${REINPLACE_CMD} -e 's;=xen tools stubdom docs;=tools;' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's;86|x86_64;86no|x86_64no;' \
 		${WRKSRC}/tools/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/xen-detect \
-		${WRKSRC}/tools/xenstore/xenstore \
-		${WRKSRC}/tools/xenstore/xenstore-control \
+		${WRKSRC}/tools/xs-clients/xenstore \
+		${WRKSRC}/tools/xs-clients/xenstore-control \
 		${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_LIB} ${WRKSRC}/tools/libs/store/libxenstore.so.4.0 \
 		${WRKSRC}/tools/libs/toolcore/libxentoolcore.so.1.0 \
 		${STAGEDIR}${PREFIX}/lib/
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-chmod
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-control
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-exists
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-list
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-ls
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-read
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-rm
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-watch
 	cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-write
 	cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -f libxenstore.so.4.0 libxenstore.so.4
 	cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -f libxentoolcore.so.1.0 libxentoolcore.so.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/xen-guest-tools/distinfo b/sysutils/xen-guest-tools/distinfo
index 2b8d6e09b994..06d1036e2087 100644
--- a/sysutils/xen-guest-tools/distinfo
+++ b/sysutils/xen-guest-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655136459
-SHA256 (xen-4.16.1.tar.gz) = cb9fc345f9b1cd724cbb6b7724674db70175183cb9015ec991843f0375e7428a
-SIZE (xen-4.16.1.tar.gz) = 44964667
+TIMESTAMP = 1743444628
+SHA256 (xen-4.20.0.tar.gz) = 47fc1bd2defe7bb7d86e58dd9b12e52c0f097855ac3e686a43f9091fe76f5319
+SIZE (xen-4.20.0.tar.gz) = 7017793
diff --git a/sysutils/xen-guest-tools/files/patch-tools-Makefile b/sysutils/xen-guest-tools/files/patch-tools-Makefile
deleted file mode 100644
index d397204e9992..000000000000
--- a/sysutils/xen-guest-tools/files/patch-tools-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.orig	2022-04-12 12:21:23 UTC
-+++ tools/Makefile
-@@ -51,6 +51,9 @@ CROSS_SYS_ROOT ?= /usr/$(CROSS_COMPILE:-=)/sys-root
- export CROSS_SYS_ROOT # exported for check/funcs.sh
- export CROSS_BIN_PATH # exported for cross-install.sh
- endif
-+ifeq ($(FREEBSD_PORT),y)
-+SUBDIRS-y := libs xenstore misc
-+endif
- 
- .PHONY: build all
- build all: subdirs-all
diff --git a/sysutils/xen-guest-tools/files/patch-tools_Makefile b/sysutils/xen-guest-tools/files/patch-tools_Makefile
new file mode 100644
index 000000000000..04f11cb4fc81
--- /dev/null
+++ b/sysutils/xen-guest-tools/files/patch-tools_Makefile
@@ -0,0 +1,13 @@
+--- tools/Makefile.orig	2025-03-31 16:57:40 UTC
++++ tools/Makefile
+@@ -53,6 +53,10 @@ endif
+ export CROSS_BIN_PATH # exported for cross-install.sh
+ endif
+ 
++ifeq ($(FREEBSD_PORT),y)
++SUBDIRS-y := libs xs-clients misc
++endif
++
+ .PHONY: build all
+ build all: subdirs-all
+ 
diff --git a/sysutils/xen-guest-tools/files/patch-xenstored_control.c b/sysutils/xen-guest-tools/files/patch-xenstored_control.c
deleted file mode 100644
index 3aec3bbb7395..000000000000
--- a/sysutils/xen-guest-tools/files/patch-xenstored_control.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/xenstore/xenstored_control.c.orig	2022-04-12 12:21:23 UTC
-+++ tools/xenstore/xenstored_control.c
-@@ -537,7 +537,7 @@ static const char *lu_reject_reason(const void *ctx)
- 			ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s",
- 					      ret ? : "Domains with long running transactions:",
- 					      conn->id,
--					      now - conn->ta_start_time);
-+					      (long)(now - conn->ta_start_time));
- 		}
- 	}
-