diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index fefa484c94a8..dd622317752c 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	kitty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23.1
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	alexis.praga@free.fr
 COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwayland-cursor.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 cpe gettext-runtime gl gmake ncurses:port pkgconfig \
 		python:3.5+ shebangfix terminfo xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	kovidgoyal
 USE_GL=		gl
 USE_XORG=	x11 xcb xcursor xi xinerama xrandr
 CPE_VENDOR=	kitty_project
 
 SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
 		update-on-ox update-on-ubuntu
 SHEBANG_GLOB=	*.py
 
 TEST_ENV=	PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
 TEST_TARGET=	test
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 INSTALL_WRKSRC=	${WRKSRC}/linux-package
 
 _STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
 		lib/kitty/kittens/diff/diff_speedup.so \
 		lib/kitty/kittens/unicode_input/unicode_names.so \
 		lib/kitty/kitty/glfw-wayland.so \
 		lib/kitty/kittens/choose/subseq_matcher.so bin/kitty
 _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64 || ${ARCH:Mriscv64*}
 MAKE_ENV+=	KITTY_NO_LTO=1
 .endif
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0)
 	${FIND} ${INSTALL_WRKSRC} -name __pycache__ -type d -exec ${RM} -r -- {} +
 
 do-install:
 	${CP} -a ${INSTALL_WRKSRC}/ ${STAGEDIR}${PREFIX}
 	${STRIP_CMD} ${_STRIP_TARGETS:S|^|${STAGEDIR}${PREFIX}/|}
 	${INSTALL_DATA} ${WRKSRC}/terminfo/kitty.terminfo \
 		${STAGEDIR}${PREFIX}/share/misc/
 
 .include <bsd.port.mk>
diff --git a/x11/kitty/files/patch-kitty_child.py b/x11/kitty/files/patch-kitty_child.py
new file mode 100644
index 000000000000..d55816ecc8a4
--- /dev/null
+++ b/x11/kitty/files/patch-kitty_child.py
@@ -0,0 +1,11 @@
+--- kitty/child.py.orig	2021-11-10 21:33:51 UTC
++++ kitty/child.py
+@@ -45,7 +45,7 @@ else:
+             return list(filter(None, f.read().decode('utf-8').split('\0')))
+ 
+     def cwd_of_process(pid: int) -> str:
+-        ans = '/proc/{}/cwd'.format(pid)
++        ans = subprocess.run(["pwdx", pid], capture_output=True).stdout.split()[1].decode("utf-8")
+         return os.path.realpath(ans)
+ 
+     def _environ_of_process(pid: int) -> str: