diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 9d37090ecd8e..b0e675dc55fe 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,82 +1,81 @@
 PORTNAME=	river
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.4
-PORTREVISION=	1
+DISTVERSION=	0.2.6
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor
 WWW=		https://github.com/riverwm/river
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.16.0:x11-toolkits/wlroots \
-		zig010>=0.10.0:lang/zig010
+		zig>=0.11.0:lang/zig
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 GH_ACCOUNT=	riverwm
-GH_TUPLE=	ifreund:zig-pixman:4a49ba1:zig_pixman/deps/zig-pixman \
-		ifreund:zig-wayland:ace6aee:zig_wayland/deps/zig-wayland \
-		ifreund:zig-xkbcommon:bfd1f97:zig_xkbcommon/deps/zig-xkbcommon \
-		swaywm:zig-wlroots:04bcd67:zig_wlroots/deps/zig-wlroots
+GH_TUPLE=	ifreund:zig-pixman:b0a9610:zig_pixman/deps/zig-pixman \
+		ifreund:zig-wayland:b9c6fcb:zig_wayland/deps/zig-wayland \
+		ifreund:zig-xkbcommon:e93ceb0:zig_xkbcommon/deps/zig-xkbcommon \
+		swaywm:zig-wlroots:46c81cd:zig_wlroots/deps/zig-wlroots
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
-		${WITH_DEBUG:D:U-Drelease-fast} \
+		${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \
 		${WITH_PIE:D-Dpie} \
 		${STRIP:C/.+/-Dstrip/} \
 		-Dcpu=${CPUTYPE:Ubaseline} \
 		--verbose
 NO_INSTALL=	yes # strip(1) breaks runtime
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}ctl \
 		bin/${PORTNAME}tile \
 		libdata/pkgconfig/${PORTNAME}-protocols.pc \
 		share/${PORTNAME}-protocols/${PORTNAME}-layout-v3.xml \
 		share/bash-completion/completions/${PORTNAME}ctl \
 		share/fish/vendor_completions.d/${PORTNAME}ctl.fish \
 		share/zsh/site-functions/_${PORTNAME}ctl \
 		${NULL}
 
 # https://github.com/ziglang/zig/issues/12170 (pixman)
 MAKE_ENV+=	PKG_CONFIG_SYSTEM_LIBRARY_PATH="${LOCALBASE}/lib"
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_CONFIGURE_ON=	-Dman-pages=true
 MANPAGES_CONFIGURE_OFF=	-Dman-pages=false
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}ctl.1.gz \
 			share/man/man1/${PORTNAME}tile.1.gz \
 			${NULL}
 
 X11_CONFIGURE_ON=	-Dxwayland=true
 X11_CONFIGURE_OFF=	-Dxwayland=false
 
 post-patch:
 # Respect devel/pkgconf default search
 	@${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \
 		${WRKSRC}/build.zig
 # Respect PREFIX in path references
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/doc/${PORTNAME}ctl.1.scd
 
 do-build:
 	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
 
 do-test:
 	@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
 
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index 7bcfadb79a14..462478a5c53b 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1676044835
-SHA256 (riverwm-river-v0.2.4_GH0.tar.gz) = 5c3f5e47442c9e66e93030b8e4fa7ca864891d92cd2dfe33e5f2a005b6a0e2fb
-SIZE (riverwm-river-v0.2.4_GH0.tar.gz) = 137708
-SHA256 (ifreund-zig-pixman-4a49ba1_GH0.tar.gz) = ae605ece2a2a38c6e35ce656c718846679b8f28728c35b366afb3d93cb881543
-SIZE (ifreund-zig-pixman-4a49ba1_GH0.tar.gz) = 7180
-SHA256 (ifreund-zig-wayland-ace6aee_GH0.tar.gz) = c6ebbf0d56db36a732d2e58deff090503b68928ceed538737de7cd4ea36681c6
-SIZE (ifreund-zig-wayland-ace6aee_GH0.tar.gz) = 55916
-SHA256 (ifreund-zig-xkbcommon-bfd1f97_GH0.tar.gz) = 0a5835a5eb216c1a59e20e59277270fc5ce5f440becadf6487965286ba4c1ce8
-SIZE (ifreund-zig-xkbcommon-bfd1f97_GH0.tar.gz) = 20467
-SHA256 (swaywm-zig-wlroots-04bcd67_GH0.tar.gz) = af2ceb32d492d3ba0b7ebf5928c89a388b8dd589a8b1f38deb08bf97c7c29ed0
-SIZE (swaywm-zig-wlroots-04bcd67_GH0.tar.gz) = 49906
+TIMESTAMP = 1700911792
+SHA256 (riverwm-river-v0.2.6_GH0.tar.gz) = 3164e61dfa7bec5060e84c7a8b79a02b3b15fe4474780a8ab0289d371f9d18a3
+SIZE (riverwm-river-v0.2.6_GH0.tar.gz) = 137846
+SHA256 (ifreund-zig-pixman-b0a9610_GH0.tar.gz) = a78d7e8dd1d7d3e3dc0eb7f50968765ede0d2055306d4eb430f336cea4bd140f
+SIZE (ifreund-zig-pixman-b0a9610_GH0.tar.gz) = 7181
+SHA256 (ifreund-zig-wayland-b9c6fcb_GH0.tar.gz) = 3e3398b29c3014763ded2e4a2c4f02b4b927fb80bde542846bca29d7b101e0d1
+SIZE (ifreund-zig-wayland-b9c6fcb_GH0.tar.gz) = 56245
+SHA256 (ifreund-zig-xkbcommon-e93ceb0_GH0.tar.gz) = e728c8f784b63f6b0e8ead513bded3b10bc73caa7b20274a5db4a0d0f5df3fce
+SIZE (ifreund-zig-xkbcommon-e93ceb0_GH0.tar.gz) = 20452
+SHA256 (swaywm-zig-wlroots-46c81cd_GH0.tar.gz) = 6b876eb4871abae8d147738ca279777a29ae433666d01071aedac2253a6257e9
+SIZE (swaywm-zig-wlroots-46c81cd_GH0.tar.gz) = 49696