diff --git a/Mk/Uses/zig.mk b/Mk/Uses/zig.mk
index 8a6f70e85f99..595196b86c60 100644
--- a/Mk/Uses/zig.mk
+++ b/Mk/Uses/zig.mk
@@ -1,118 +1,118 @@
 # Provide support for building Zig software.
 #
 # Feature:	zig
 # Usage:	USES=zig
 # Valid ARGS:	(none), XYZ
 #
 # XYZ		Specify alternative Zig compiler version
 
 # Variables, which can be set by the port:
 #
 #  ZIG_TUPLE		List of Zig dependencies required to build the port.
 #			Each item is triplet of an arbitrary name, an URL without
 #			scheme part (https://) and a directory name where the
 #			expects this dependency to be placed.
 #			This knob can be generated by running make make-zig-tuple
 #			You might need to run this multiple time until all
 #			transitive dependencies get pulled in.
 #
 # MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ZIG_MK)
 _INCLUDE_USES_ZIG_MK=    yes
 
 # Check arguments sanity
 .  if !empty(zig_ARGS:N[0-9][0-9][0-9])
 IGNORE=	USES=zig has invalid arguments: ${zig_ARGS:N[0-9][0-9][0-9]}
 .  endif
 
 .sinclude "${MASTERDIR}/Makefile.zig"
 
 ZIG_CMD?=	zig
 ZIG_PORT?=	lang/zig${zig_ARGS}
 ZIG_DEPSDIR=	${WRKDIR}/zig-packages
 ZIG_TMPDEPSDIR=	${WRKDIR}/zig-packages-tmp
 
 # Check alternative Zig version if requested
 .  if ${zig_ARGS} && !exists(${PORTSDIR}/${ZIG_PORT})
 IGNORE?= USES=zig has invalid version number: ${zig_ARGS}
 .  endif
 
-ZIG_CPUTYPE_DEFAULT=	${ARCH:S/amd64/x86_64/:S/aarch64/generic/:S/powerpc64le/generic/}
+ZIG_CPUTYPE_DEFAULT=	${ARCH:S/amd64/x86_64/:S/aarch64/generic/:S/powerpc64le/pwr8/}
 ZIG_CPUTYPE?=		${CPUTYPE:U${ZIG_CPUTYPE_DEFAULT}}
 
 _ZIG2TUPLE_CMD=	zig2tuple
 
 BUILD_DEPENDS+=	${ZIG_CMD}:${ZIG_PORT}
 
 DIST_SUBDIR?=	zig
 
 .  for z in ${ZIG_TUPLE}
 .    for group url dir in ${z:S/:/ /g:tw}
 MASTER_SITES+=	https://${url:H}/:${group}
 DISTFILES+=	${url:T}:${group}
 WRKSRC_${group}=${ZIG_DEPSDIR}/${dir}
 .    endfor
 .  endfor
 
 _USES_extract=	299:zig-pre-extract
 
 # Generates ZIG_TUPLE= ... line ready to be pasted into the port based on
 # build.zig.zon files found in ${WRKSRC}
 make-zig-tuple: check-zig2tuple
 	@${ECHO_MSG} "===> Processing build.zig.zon files"
 	${_ZIG2TUPLE_CMD} ${WRKDIR}
 
 check-zig2tuple:
 	@if ! type ${_ZIG2TUPLE_CMD} > /dev/null 2>&1; then \
 		${ECHO_MSG} "===> zig2tuple executable not found, install \"ports-mgmt/zig2tuple\""; exit 1; \
 	fi
 
 # Main targets implementation.
 
 zig-pre-extract:
 	@${ECHO_CMD} "===> Extracting zig dependencies"
 # We don't know the name of the directory that is contained in the archive,
 # but we need to rename it into the last component of the tuple
 # To solve this we extract into an empty directory and then do
 # mv * /path/where/we/want/it
 	@${MKDIR} ${ZIG_DEPSDIR} ${ZIG_TMPDEPSDIR}
 .  for z in ${ZIG_TUPLE}
 .    for group url dir in ${z:S/:/ /g:tw}
 	${MAKE} -C ${.CURDIR} do-extract EXTRACT_ONLY=${url:T} WRKDIR=${ZIG_TMPDEPSDIR}
 	# In some cases the distfile holds files at the top level of the archive,
 	# s we have to move ${ZIG_TMPDEPSDIR} itself, not its contents.
 	if [ "$$(${FIND} ${ZIG_TMPDEPSDIR} -depth 1 -type f)" ]; then \
 		${MV} ${ZIG_TMPDEPSDIR} ${ZIG_DEPSDIR}/${dir}; \
 	else \
 		${MV} ${ZIG_TMPDEPSDIR}/* ${ZIG_DEPSDIR}/${dir}; \
 	fi
 .    endfor
 .  endfor
 	@${RMDIR} ${ZIG_TMPDEPSDIR}
 
 ZIG_ENV+=	DESTDIR=${STAGEDIR}
 ZIG_ARGS+=	--prefix ${PREFIX} --system ${ZIG_DEPSDIR} --verbose \
 		-Dcpu=${ZIG_CPUTYPE} \
 		${"${WITH_DEBUG}" != "":?:--release=fast} \
 		${"${WITH_DEBUG}" != "":?-Doptimize=Debug:-Doptimize=ReleaseSmall} \
 		${ZIG_ARGS_${FLAVOR}}
 DO_MAKE_BUILD?=	${SETENVI} ${WRK_ENV} ${ZIG_ENV} ${ZIG_CMD} build \
 				${_MAKE_JOBS} ${ZIG_ARGS}
 .  if !target(do-build)
 do-build:
 	@${DO_NADA}
 .  endif
 
 .  if !target(do-install)
 do-install:
 	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD}; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Compilation failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
 			fi; \
 		${FALSE}; \
 		fi)
 .  endif
 
 .endif
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index eadc16e2a3b9..b615da134f71 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,40 +1,46 @@
 PORTNAME=	river
 DISTVERSION=	0.4.5
 PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 MASTER_SITES=	https://codeberg.org/river/river/releases/download/v${DISTVERSION}/
 DISTFILES=	river-${DISTVERSIONFULL}${EXTRACT_SUFX}
 
 MAINTAINER=	siva@FreeBSD.org
 COMMENT=	Non-monolithic Wayland compositor
 WWW=		https://isaacfreund.com/software/river/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwayland-server.so:graphics/wayland \
 		libwlroots-0.20.so:x11-toolkits/wlroots020 \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		pkgconfig xorg zig
 USE_XORG=	pixman
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_CONFIGURE_ON=	-Dman-pages=true
 MANPAGES_CONFIGURE_OFF=	-Dman-pages=false
 
 X11_CONFIGURE_ON=	-Dxwayland=true
 X11_CONFIGURE_OFF=	-Dxwayland=false
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64
+ZIG_ARGS+=	-Dllvm=true
+.endif
+
 do-test:
 	@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
 
 .include <bsd.port.mk>