diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 6b93d4fc8a6f..3cb8bba2b4fe 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,45 +1,44 @@
 # Created by: Dennis Herrmann <dhn@FreeBSD.org>
 
 PORTNAME=	i3
-DISTVERSION=	4.19.2
+DISTVERSION=	4.20
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://i3wm.org/downloads/ \
 		http://i3wm.org/downloads/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES+=	d0067077ed9f.patch:-p1 # https://github.com/i3/i3/pull/4264
-
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Improved dynamic tiling window manager
 
 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 \
 		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-Try-Tiny>=0:lang/p5-Try-Tiny
 
-USES=		compiler:c11 iconv localbase:ldflags meson perl5 pkgconfig tar:xz xorg
+USES=		compiler:c11 gnome iconv localbase:ldflags meson perl5 \
+		pkgconfig tar:xz xorg
+USE_GNOME=	glib20
 USE_XORG=	xcb
 MESON_ARGS=	-Ddocs=false \
 		-Dmans=false
 LDFLAGS+=	${ICONV_LIB}
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	i3-gaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index 3a33737becc0..de3d4440c6bc 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1614605399
-SHA256 (i3-4.19.2.tar.xz) = 8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279
-SIZE (i3-4.19.2.tar.xz) = 1277396
-SHA256 (d0067077ed9f.patch) = 2131a32d9b96c359ce169b243c8a87e826d508a0842a373009255e2f424a7fe2
-SIZE (d0067077ed9f.patch) = 1174
+TIMESTAMP = 1635845011
+SHA256 (i3-4.20.tar.xz) = 8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322
+SIZE (i3-4.20.tar.xz) = 1286300
diff --git a/x11-wm/i3/files/patch-include_libi3.h b/x11-wm/i3/files/patch-include_libi3.h
new file mode 100644
index 000000000000..660691cc77ab
--- /dev/null
+++ b/x11-wm/i3/files/patch-include_libi3.h
@@ -0,0 +1,10 @@
+--- include/libi3.h.orig	2021-10-19 06:37:59 UTC
++++ include/libi3.h
+@@ -15,6 +15,7 @@
+ #include <stdbool.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <sys/stat.h>
+ #include <xcb/xcb.h>
+ #include <xcb/xproto.h>
+ #include <xcb/xcb_keysyms.h>
diff --git a/x11-wm/i3/files/patch-src_config__parser.c b/x11-wm/i3/files/patch-src_config__parser.c
new file mode 100644
index 000000000000..599675c1b0ed
--- /dev/null
+++ b/x11-wm/i3/files/patch-src_config__parser.c
@@ -0,0 +1,11 @@
+--- src/config_parser.c.orig	2021-10-19 06:37:59 UTC
++++ src/config_parser.c
+@@ -864,7 +864,7 @@ parse_file_result_t parse_file(struct parser_ctx *ctx,
+     FILE *fstr;
+     char buffer[4096], key[512], value[4096], *continuation = NULL;
+ 
+-    char *old_dir = get_current_dir_name();
++    char *old_dir = getwd(NULL);
+     char *dir = NULL;
+     /* dirname(3) might modify the buffer, so make a copy: */
+     char *dirbuf = sstrdup(f);