diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 3cb8bba2b4fe..08de1fe2f340 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,44 +1,44 @@
 # Created by: Dennis Herrmann <dhn@FreeBSD.org>
 
 PORTNAME=	i3
-DISTVERSION=	4.20
+DISTVERSION=	4.20.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://i3wm.org/downloads/ \
 		http://i3wm.org/downloads/
 
 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 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 de3d4440c6bc..307d9eddeb5d 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635845011
-SHA256 (i3-4.20.tar.xz) = 8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322
-SIZE (i3-4.20.tar.xz) = 1286300
+TIMESTAMP = 1635944168
+SHA256 (i3-4.20.1.tar.xz) = 23e1ecaf208c1d162a0c8c66c4590b301a424ee5c011227eabb96e36fd6bfce6
+SIZE (i3-4.20.1.tar.xz) = 1284984
diff --git a/x11-wm/i3/files/patch-include_libi3.h b/x11-wm/i3/files/patch-include_libi3.h
deleted file mode 100644
index 660691cc77ab..000000000000
--- a/x11-wm/i3/files/patch-include_libi3.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 599675c1b0ed..000000000000
--- a/x11-wm/i3/files/patch-src_config__parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);