diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 43b450e9a36..7cd3fd2057e 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	qemu
 DISTVERSION=	9.2.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -16,11 +17,13 @@ ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 .endif
 
 BUILD_DEPENDS=	bash:shells/bash
+.if ${FLAVOR:U} != guestagent
+LIB_DEPENDS+=	libzstd.so:archivers/zstd
+.endif
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 LIB_DEPENDS+=	libfdt.so:sysutils/dtc \
 		libinotify.so:devel/libinotify \
-		libslirp.so:net/libslirp \
-		libzstd.so:archivers/zstd
+		libslirp.so:net/libslirp
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
 LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
@@ -114,7 +117,7 @@ CONFIGURE_ARGS+=	--disable-attr \
 			--disable-vnc
 .endif
 .if ${FLAVOR:U} == tools
-CONFIGURE_ARGS+=	--enable-tools
+CONFIGURE_ARGS+=	--enable-tools --enable-zstd
 .endif
 
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
@@ -216,6 +219,14 @@ X86_TARGETS_CONFIGURE_ON=	--target-list='i386-softmmu i386-bsd-user x86_64-softm
 
 .include <bsd.port.options.mk>
 
+.if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
+.if ${ARCH} == "i386" || ${ARCH} == "powerpc"
+PLIST_SUB+=	NO_I386="@comment "
+.else
+PLIST_SUB+=	NO_I386=""
+.endif
+.endif
+
 .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
 .if ${ARCH} == "amd64"
diff --git a/emulators/qemu/pkg-plist-ga b/emulators/qemu/pkg-plist-ga
index 7d934bfea85..76fa57967f1 100644
--- a/emulators/qemu/pkg-plist-ga
+++ b/emulators/qemu/pkg-plist-ga
@@ -1,5 +1,5 @@
 bin/qemu-ga
-include/qemu-plugin.h
+%%NO_I386%%include/qemu-plugin.h
 %%PORTDOCS%%share/man/man1/qemu.1.gz
 %%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz
 %%PORTDOCS%%share/man/man7/qemu-cpu-models.7.gz
diff --git a/emulators/qemu/pkg-plist-tools b/emulators/qemu/pkg-plist-tools
index 0be0420db84..2d227cf2fa0 100644
--- a/emulators/qemu/pkg-plist-tools
+++ b/emulators/qemu/pkg-plist-tools
@@ -3,7 +3,7 @@ bin/qemu-img
 bin/qemu-io
 bin/qemu-nbd
 bin/qemu-storage-daemon
-include/qemu-plugin.h
+%%NO_I386%%include/qemu-plugin.h
 %%PORTDOCS%%share/man/man1/qemu.1.gz
 %%PORTDOCS%%share/man/man1/qemu-img.1.gz
 %%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz