diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 2a38e0cef473..7535b2aee4ae 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,89 +1,92 @@
 # Created by: Carl Makin <carl@stagecraft.cx>
 
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.1.6
+DISTVERSION=	2.1.8
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf \
 		libpcre.so:devel/pcre
 
-USES=		gettext gmake gnome jpeg motif python:run shebangfix xorg
+USES=		autoreconf gmake gnome jpeg motif shebangfix xorg
 
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
 GH_PROJECT=	Xastir
-#CFLAGS+=	-fcommon
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		BDB CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
 OPTIONS_RADIO=		MGG
 OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
 MGG_DESC=	Image library for raster map processing
 IMAGICK_DESC=	ImageMagick (Version 6)
 GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
 OPTIONS_DEFAULT=	BDB CURL GMAGICK
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
 IMAGICK_USES=		magick:6
 IMAGICK_CONFIGURE_WITH=	imagemagick
 
 GMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GMAGICK_CONFIGURE_WITH=	graphicsmagick
 GMAGICK_USES=		compiler:gcc-c++11-lib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
 GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
 FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=	festival
 
 #RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 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 ba86a2720b84..973b4c0e855f 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600663254
-SHA256 (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e
-SIZE (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 2687180
+TIMESTAMP = 1636154486
+SHA256 (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
+SIZE (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = 2222586
diff --git a/comms/xastir/files/patch-Makefile.am b/comms/xastir/files/patch-Makefile.am
new file mode 100644
index 000000000000..6b06e9b70d78
--- /dev/null
+++ b/comms/xastir/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2021-12-29 11:33:10 UTC
++++ Makefile.am
+@@ -76,7 +76,7 @@ install-data-hook:
+ 	rm -f CC_OpenStreetMap.png && \
+ 	$(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
+  
+-mandir=${prefix}/share/man
++mandir=@mandir@
+ man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
+ 
+ # Use tiles for these maps
diff --git a/comms/xastir/files/patch-Makefile.in b/comms/xastir/files/patch-Makefile.in
deleted file mode 100644
index 3254ccec7886..000000000000
--- a/comms/xastir/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2016-07-01 18:52:47 UTC
-+++ Makefile.in
-@@ -284,7 +284,7 @@ libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
- lpr = @lpr@
--mandir = ${prefix}/share/man
-+mandir = @mandir@
- mkdir_p = @mkdir_p@
- mv = @mv@
- oldincludedir = @oldincludedir@
diff --git a/comms/xastir/files/patch-src_Makefile.in b/comms/xastir/files/patch-src_Makefile.in
deleted file mode 100644
index 1866382287cc..000000000000
--- a/comms/xastir/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.in.orig	2014-09-12 19:05:57 UTC
-+++ src/Makefile.in
-@@ -522,6 +522,12 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xa_config.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xastir_udp_client.Po@am__quote@
- 
-+ifeq ($(host_cpu),sparc64)
-+draw_symbols.o: draw_symbols.c
-+@am__fastdepCC_TRUE@	$(patsubst -O%,-O0,$(COMPILE)) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+endif
-+
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po