diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index a5b1c6070cd8..3445fc193c65 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	river
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.1
+DISTVERSION=	0.3.2
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor
 WWW=		https://isaacfreund.com/software/river/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
-		zig011>=0.11.0:lang/zig011
+		zig>=0.12.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:70bff91:zig_pixman/deps/zig-pixman \
-		ifreund:zig-wayland:73fed09:zig_wayland/deps/zig-wayland \
-		ifreund:zig-xkbcommon:7e09b38:zig_xkbcommon/deps/zig-xkbcommon \
-		swaywm:zig-wlroots:5bc01a9:zig_wlroots/deps/zig-wlroots
+GH_TUPLE=	ifreund:zig-pixman:v0.1.0:zig_pixman/../.cache/zig/p/122014eeb4600a059bdcfe1c864862f17e6d5e4237e3bb7d6818f2a5583f6f4eb843 \
+		ifreund:zig-wayland:v0.1.0:zig_wayland/../.cache/zig/p/1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d \
+		ifreund:zig-xkbcommon:v0.1.0:zig_xkbcommon/../.cache/zig/p/1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017 \
+		swaywm:zig-wlroots:v0.17.0:zig_wlroots/../.cache/zig/p/1220714d1cc39c3abb1d9c22a0b838d847ead099cb7d9931821490483f30c022e827
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
 		${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}
 
 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 <bsd.port.mk>
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index 942451e9ef70..4fe0b7f2ba32 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1716044943
-SHA256 (riverwm-river-v0.3.1_GH0.tar.gz) = 916b28ed2bd01e048c1a82bcb7a8c0745fedc081a24099f8025375c4b3c3d30d
-SIZE (riverwm-river-v0.3.1_GH0.tar.gz) = 169544
-SHA256 (ifreund-zig-pixman-70bff91_GH0.tar.gz) = 609ff73c4d7fc713fb3debb742b3b09d41d8abdc181c959b339212435f9815ef
-SIZE (ifreund-zig-pixman-70bff91_GH0.tar.gz) = 7331
-SHA256 (ifreund-zig-wayland-73fed09_GH0.tar.gz) = ef0fbba3be3d03bd288cf3037887c0de2215489970bae0e31e7b777a049cd3d4
-SIZE (ifreund-zig-wayland-73fed09_GH0.tar.gz) = 56012
-SHA256 (ifreund-zig-xkbcommon-7e09b38_GH0.tar.gz) = 2dff1035f19d1e758c072e7690e65777e2a63ea08894273518d034451c29ed99
-SIZE (ifreund-zig-xkbcommon-7e09b38_GH0.tar.gz) = 21884
-SHA256 (swaywm-zig-wlroots-5bc01a9_GH0.tar.gz) = 7e575a6105829ec8dbb03ff1c6783419cbcb9640621484d9d079226227873cd3
-SIZE (swaywm-zig-wlroots-5bc01a9_GH0.tar.gz) = 53830
+TIMESTAMP = 1716200053
+SHA256 (riverwm-river-v0.3.2_GH0.tar.gz) = d5e681e0abc0530e9587f1f23b6ede4c9ddf15e4ece5cf26cac16fe1b5c9e9a9
+SIZE (riverwm-river-v0.3.2_GH0.tar.gz) = 170145
+SHA256 (ifreund-zig-pixman-v0.1.0_GH0.tar.gz) = 03ea240ee8389b2884197d920c80aff3f63b394c0ec2237341fedbc20242dd0a
+SIZE (ifreund-zig-pixman-v0.1.0_GH0.tar.gz) = 7872
+SHA256 (ifreund-zig-wayland-v0.1.0_GH0.tar.gz) = 243a46239a75113376294a739bc27870961882ff95eeb5b20207d2c0f49990de
+SIZE (ifreund-zig-wayland-v0.1.0_GH0.tar.gz) = 56342
+SHA256 (ifreund-zig-xkbcommon-v0.1.0_GH0.tar.gz) = 62875763fa7a9262c4eda62235259aeafc6fce54568f41119a059e8ac392dbb7
+SIZE (ifreund-zig-xkbcommon-v0.1.0_GH0.tar.gz) = 22487
+SHA256 (swaywm-zig-wlroots-v0.17.0_GH0.tar.gz) = e44d2debd61a320fad04201cfd8a68d85cf31731716f3822929b48bb4d0496a7
+SIZE (swaywm-zig-wlroots-v0.17.0_GH0.tar.gz) = 54942