diff --git a/x11-wm/i3-gaps/Makefile b/x11-wm/i3-gaps/Makefile
index f63462427162..6700c7a3a7f0 100644
--- a/x11-wm/i3-gaps/Makefile
+++ b/x11-wm/i3-gaps/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	i3
-DISTVERSION=	4.20.1
+DISTVERSION=	4.21
 CATEGORIES=	x11-wm
 PKGNAMESUFFIX=	-gaps
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Fork of i3 tiling window manager with more features, including gaps
 WWW=		https://github.com/Airblader/i3
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libev.so:devel/libev \
 		libpangocairo-1.0.so:x11-toolkits/pango \
-		libpcre.so:devel/pcre \
+		libpcre2-8.so:devel/pcre2 \
 		libstartup-notification-1.so:x11/startup-notification \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm \
 		libxkbcommon.so:x11/libxkbcommon \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \
 		p5-IPC-Run>=0:devel/p5-IPC-Run \
 		p5-JSON-XS>=0:converters/p5-JSON-XS \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		compiler:c11 gettext-runtime gnome iconv localbase:ldflags \
 		meson perl5 pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Airblader
 USE_GNOME=	glib20
 USE_XORG=	xcb
 
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	i3
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 DOCS_MESON_TRUE=	docs
 
 MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			xmlto:textproc/xmlto
 MANPAGES_MESON_TRUE=	mans
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' -e 's,/etc,${PREFIX}&,g' \
 		${WRKSRC}/man/i3-config-wizard.man \
 		${WRKSRC}/man/i3.man
 
 .include <bsd.port.mk>
diff --git a/x11-wm/i3-gaps/distinfo b/x11-wm/i3-gaps/distinfo
index b1738d2254bc..bb7ad34f5914 100644
--- a/x11-wm/i3-gaps/distinfo
+++ b/x11-wm/i3-gaps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637781555
-SHA256 (Airblader-i3-4.20.1_GH0.tar.gz) = 717f2499e1c6eb5c04e5c6d30442234387181e2b731366274b40bbf682f93d95
-SIZE (Airblader-i3-4.20.1_GH0.tar.gz) = 4199697
+TIMESTAMP = 1663956664
+SHA256 (Airblader-i3-4.21_GH0.tar.gz) = 13b87cb4158f51fcbe9f21a6872c30aba682109f2c34db16c6bbf57ea76c89d6
+SIZE (Airblader-i3-4.21_GH0.tar.gz) = 4212229