diff --git a/irc/hexchat/Makefile b/irc/hexchat/Makefile
index 8724a431c9d98..cd79aa5b1ea8d 100644
--- a/irc/hexchat/Makefile
+++ b/irc/hexchat/Makefile
@@ -1,9 +1,9 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 
 PORTNAME=	hexchat
-PORTVERSION=	2.16.1
-DISTVERSIONPREFIX=	v
+DISTVERSION=	2.16.1
 CATEGORIES=	irc gnome
+MASTER_SITES=	https://dl.hexchat.net/hexchat/
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	IRC chat program with GTK and Text Frontend
@@ -21,16 +21,18 @@ RUN_DEPENDS=	${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes
 
 USES=		compiler:c++11-lang cpe desktop-file-utils gettext-tools gnome \
 		libtool localbase meson ninja pkgconfig python:3.5+ shebangfix \
-		ssl xorg
+		ssl tar:xz xorg
 CPE_VENDOR=	${PORTNAME}_project
-USE_GNOME=	cairo gtk20 intltool libxml2
+SHEBANG_FILES=	meson_post_install.py \
+		plugins/perl/generate_header.py \
+		plugins/python/generate_plugin.py \
+		src/common/make-te.py
+USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool libxml2
 USE_XORG=	x11
-USE_GITHUB=	yes
 
-MESON_ARGS=	-Dtls=enabled -Dgtk-frontend=true -Dwith-python=python-${PYTHON_VER}
-INSTALL_TARGET=	install-strip
+INSTALLS_ICONS=yes
 
-LIBS+=		-lX11
+MESON_ARGS=	-Dtls=enabled -Dgtk-frontend=true -Dwith-python=python-${PYTHON_VER}
 
 SUB_FILES=	pkg-message
 
@@ -66,12 +68,6 @@ PERL_USES=		perl5
 TEXTFE_MESON_TRUE=	text-frontend
 SYSINFO_MESON_TRUE=	with-sysinfo
 
-BINARY_ALIAS=	python3=${PYTHON_CMD}
-
-SHEBANG_FILES=	meson_post_install.py \
-		plugins/perl/generate_header.py \
-		src/common/make-te.py
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g' \
diff --git a/irc/hexchat/distinfo b/irc/hexchat/distinfo
index 426fe546ea317..c27b2d11906e3 100644
--- a/irc/hexchat/distinfo
+++ b/irc/hexchat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644698557
-SHA256 (hexchat-hexchat-v2.16.1_GH0.tar.gz) = f15bc487312a96a902e042e8f197a8494a29bcf4a00bbfd276a5e8154263bfe5
-SIZE (hexchat-hexchat-v2.16.1_GH0.tar.gz) = 2770317
+TIMESTAMP = 1644739445
+SHA256 (hexchat-2.16.1.tar.xz) = a7e497da71df419daf9855582d51c723a2611de25d5e97b5efc33fe78da5c4c7
+SIZE (hexchat-2.16.1.tar.xz) = 1349536