diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 08668aced2bd..f43f5c04b272 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.1.8
-PORTREVISION=	7
+DISTVERSION=	2.2.0
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
@@ -23,7 +22,9 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf \
-		libpcre.so:devel/pcre
+		libpcre2-8.so:devel/pcre2 \
+		libjxl.so:graphics/libjxl \
+		libjxl_threads.so:graphics/libjxl
 
 USES=		autoreconf gmake gnome jpeg motif shebangfix xorg
 
@@ -85,7 +86,4 @@ BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${BDB_LIB_DIR}
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|2>&1||g' ${WRKSRC}/acinclude.m4
-
 .include <bsd.port.mk>
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 973b4c0e855f..881572f4134a 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636154486
-SHA256 (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
-SIZE (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = 2222586
+TIMESTAMP = 1691217889
+SHA256 (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 4d1844a5c9f31407d34fa0339a2b462f8c53991d41045ad16b39ded5dcdfb2fe
+SIZE (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 2232411
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index 245d01c79a3c..16196680fb65 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -12,12 +12,11 @@ man/man1/xastir_udp_client.1.gz
 %%DOCSDIR%%/COPYING.LIB.LESSTIF
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/FAQ
-%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/INSTALL.md
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.CYGWIN
 %%DOCSDIR%%/README.GIT
-%%DOCSDIR%%/README.Getting-Started
 %%DOCSDIR%%/README.MAPS
 %%DOCSDIR%%/README.OSM_maps
 %%DOCSDIR%%/README.sudo
@@ -86,6 +85,7 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/config/nwsw_ddmmyy_14a.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_17.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_20.dbfawk
+%%DATADIR%%/config/nwsw_ddmmyy_22.dbfawk
 %%DATADIR%%/config/nwsz1ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk