diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 1080df96aa1b..2b69fa2c9b25 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	river
-PORTVERSION=	s20210421
+PORTVERSION=	s20210422
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.13.0:x11-toolkits/wlroots \
 		zig>=0.7.1:lang/zig
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 GH_ACCOUNT=	ifreund
-GH_TAGNAME=	891eb38
-GH_TUPLE=	ifreund:zig-pixman:f8e682a:zig_pixman/deps/zig-pixman \
+GH_TAGNAME=	84f5283
+GH_TUPLE=	ifreund:zig-pixman:9acac69:zig_pixman/deps/zig-pixman \
 		ifreund:zig-wayland:f170fe0:zig_wayland/deps/zig-wayland \
 		ifreund:zig-xkbcommon:9e4d41f:zig_xkbcommon/deps/zig-xkbcommon \
 		swaywm:zig-wlroots:6c62568:zig_wlroots/deps/zig-wlroots
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
 		${WITH_DEBUG:U-Drelease-fast=true} \
 		--verbose
 NO_INSTALL=	yes # strip(1) breaks runtime
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}ctl \
 		bin/${PORTNAME}tile \
 		"@sample ${ETCDIR}/init.sample" \
 		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 PREFIX for system-wide config (a la sysconfdir in Meson)
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/doc/${PORTNAME}.1.scd \
 		${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})
 
 post-install:
 # Let @sample handle default files under etc/
 	@${MV} ${STAGEDIR}${ETCDIR}/init ${STAGEDIR}${ETCDIR}/init.sample
 
 .include <bsd.port.mk>
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index fd54ab68485c..d82aa3d8b398 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1619016713
-SHA256 (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 8371f8cdd181225074401b2de1774a116d8a42fa7d044ed43ea2bd805d8452b4
-SIZE (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 114435
-SHA256 (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 1e040e7652861d7064e2997f5f6397483dca87261621318c9a06d7701bae67aa
-SIZE (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 7052
+TIMESTAMP = 1619080408
+SHA256 (ifreund-river-s20210422-84f5283_GH0.tar.gz) = 9b54a338edf25dc747b47244bea725f9f836d421ccef8d5a1e3f61060dee4b55
+SIZE (ifreund-river-s20210422-84f5283_GH0.tar.gz) = 114424
+SHA256 (ifreund-zig-pixman-9acac69_GH0.tar.gz) = 748ab9bad42e2e67fd0976eeed215182a0d72df17ac82183d53f810c22137da0
+SIZE (ifreund-zig-pixman-9acac69_GH0.tar.gz) = 7153
 SHA256 (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 5ab51c15c56921a1e1269da469bbbd2ac5d8b9bb01e09b9db9409d06a76d5014
 SIZE (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 52945
 SHA256 (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 3af5c9a448cf311d9cc819c8fd1dba114fbd7a4407f4174f95e4c82bb37f447b
 SIZE (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 19025
 SHA256 (swaywm-zig-wlroots-6c62568_GH0.tar.gz) = 85acd43b8cfdc448734ef1fc4f78e5114a16533bcebd32933e089eaf87444d6f
 SIZE (swaywm-zig-wlroots-6c62568_GH0.tar.gz) = 33930