diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -16334,3 +16334,4 @@
 print/rubygem-pdf-core07|print/rubygem-pdf-core|2021-05-16|Obsoleted. Use print/rubygem-pdf-core instead
 security/bitwarden_rs|security/vaultwarden|2021-05-16|Project was renamed
 sysutils/kdiskmark|benchmarks/kdiskmark|2021-05-18|Moved to a more appropriate category
+sysutils/edk2@xen|sysutils/edk2@xen_x64|2021-05-18|Add Xen arch to the flavor name to be futur-proof
diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -11,7 +11,7 @@
 ONLY_FOR_ARCHS_REASON=	This port only provides firmware for aarch64 and amd64 machine
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
-FLAVORS=	macchiatobin rpi3 rpi4 xen
+FLAVORS=	macchiatobin rpi3 rpi4 xen_x64
 FLAVOR?=	macchiatobin
 
 USES=	gmake python:3.7+,build
@@ -71,13 +71,13 @@
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
-.if ${FLAVOR} == xen
+.if ${FLAVOR} == xen_x64
 PLAT=		xen
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfXen.dsc
 PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC5/FV/OVMF.fd
-PLAT_FILENAME=	XEN_EFI.fd
+PLAT_FILENAME=	XEN_X64_EFI.fd
 .endif
 
 PLIST_FILES=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -17,9 +17,9 @@
 		libargp.so:devel/argp-standalone \
 		libxml2.so:textproc/libxml2
 BUILD_DEPENDS=	seabios>0:misc/seabios \
-		${LOCALBASE}/share/edk2-xen/XEN_EFI.fd:sysutils/edk2@xen
+		${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64
 RUN_DEPENDS=	seabios>0:misc/seabios \
-		${LOCALBASE}/share/edk2-xen/XEN_EFI.fd:sysutils/edk2@xen
+		${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64
 
 OPTIONS_DEFINE=		DOCS SPICE
 OPTIONS_DEFAULT=	DOCS
@@ -45,7 +45,7 @@
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 CONFIGURE_ARGS+=	--with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \
-			--with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_EFI.fd \
+			--with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd \
 			--mandir=${MANPREFIX}/man
 
 SHEBANG_FILES=	tools/misc/xencov_split \