diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index 2ee52c8f63a1..ad5e661ba958 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,75 +1,81 @@
 PORTNAME=	kitty
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.24.1
+DISTVERSION=	0.24.2
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 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 \
 		librsync.so:net/librsync \
 		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
+USES=		compiler:c11 cpe gettext-runtime gl gmake pkgconfig \
+		python:3.5+ shebangfix tar:xz terminfo xorg
 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 \
 		lib/kitty/kittens/transfer/rsync.so
 
 _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
 
+# ncursesw and tinfo >= 6.1 seem to be neededd
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400035
+USES+=ncurses:port
+.else
+USES+=ncurses
+.endif
+
 # For librsync, we need to set header and library path
 do-build:
 	(cd ${WRKSRC} && \
 	        ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0 --extra-include-dirs ${LOCALBASE}/include/ --extra-library-dirs ${LOCALBASE}/lib)
 	${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/distinfo b/x11/kitty/distinfo
index e5d90811e2c7..0121dc3acd11 100644
--- a/x11/kitty/distinfo
+++ b/x11/kitty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641939405
-SHA256 (kovidgoyal-kitty-v0.24.1_GH0.tar.gz) = a49b7ea7d36989fb17bd31935dc6a9a619338647c58ca1eb00400340b0d756ff
-SIZE (kovidgoyal-kitty-v0.24.1_GH0.tar.gz) = 5828079
+TIMESTAMP = 1644667031
+SHA256 (kitty-0.24.2.tar.xz) = 66a99fcfeae481db65b94b0bc5fdb4bb28b099fe4fa94b9c0fb0284f34c7b9c7
+SIZE (kitty-0.24.2.tar.xz) = 4601672