diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 3893769060b8..2c70195b0d78 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	river
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.5
+DISTVERSION=	0.3.6
 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 \
 		zig>=0.13.0:lang/zig
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwayland-server.so:graphics/wayland \
 		libwlroots-0.18.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:v0.2.0:zig_pixman/../.cache/zig/p/12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56 \
 		ifreund:zig-wayland:v0.2.0:zig_wayland/../.cache/zig/p/1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242 \
 		ifreund:zig-xkbcommon:v0.2.0:zig_xkbcommon/../.cache/zig/p/1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f \
-		swaywm:zig-wlroots:v0.18.0:zig_wlroots/../.cache/zig/p/12204d789e17c158971f69c7b900e8d8f288e7b9e42b2242f3adfbca57e8266d848f
+		swaywm:zig-wlroots:v0.18.1:zig_wlroots/../.cache/zig/p/122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1
 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 e52dacfaf669..7edfe43d7e53 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1721661661
-SHA256 (riverwm-river-v0.3.5_GH0.tar.gz) = 39c2cdffedf3d77e3f1808fe2be62b332435e92f4919aefec98d4e4bf998f302
-SIZE (riverwm-river-v0.3.5_GH0.tar.gz) = 170795
+TIMESTAMP = 1733752913
+SHA256 (riverwm-river-v0.3.6_GH0.tar.gz) = 567d4d2df10381b5e295cb17ff59ca396aab0830d2ad5422ec1ff679c26c2a65
+SIZE (riverwm-river-v0.3.6_GH0.tar.gz) = 171734
 SHA256 (ifreund-zig-pixman-v0.2.0_GH0.tar.gz) = 298c015764ff917fceec45c1382b50ec371e06f75e50f097c8380ca565c3b581
 SIZE (ifreund-zig-pixman-v0.2.0_GH0.tar.gz) = 7886
 SHA256 (ifreund-zig-wayland-v0.2.0_GH0.tar.gz) = 6cbbb8ca10c84cc83a09b21e3b84e0ab4238306376b268788fedcc46397b322d
 SIZE (ifreund-zig-wayland-v0.2.0_GH0.tar.gz) = 56461
 SHA256 (ifreund-zig-xkbcommon-v0.2.0_GH0.tar.gz) = 4ef3193a375f1893475c3bc481d262a7eef5c28e0d1ea7c20739deaa4f8df6bd
 SIZE (ifreund-zig-xkbcommon-v0.2.0_GH0.tar.gz) = 22495
-SHA256 (swaywm-zig-wlroots-v0.18.0_GH0.tar.gz) = 16400f9b2c20b59ddc5c51d04749819cfccfa4d39a310ce2ef283b492b7f64a3
-SIZE (swaywm-zig-wlroots-v0.18.0_GH0.tar.gz) = 56386
+SHA256 (swaywm-zig-wlroots-v0.18.1_GH0.tar.gz) = 168798907f30da2ed0fbe0b132f3dc0bfcf3f5d5b75c2ea9d425f47be54fc7a9
+SIZE (swaywm-zig-wlroots-v0.18.1_GH0.tar.gz) = 56734