diff --git a/srcpkgs/xastir/patches/fix-mutex.patch b/srcpkgs/xastir/patches/fix-mutex.patch
new file mode 100644
index 00000000000..129cd38b4d1
--- /dev/null
+++ b/srcpkgs/xastir/patches/fix-mutex.patch
@@ -0,0 +1,15 @@
+--- a/src/util.c	2019-07-15 00:30:31.000000000 +0200
++++ b/src/util.c	2019-08-31 15:56:13.580212122 +0200
+@@ -5457,10 +5457,10 @@
+   // NON_LSB VERSION
+   // Check first for newer pthread function
+ #  ifdef HAVE_PTHREAD_MUTEXATTR_SETTYPE
+-  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  else
+   // Use older, deprecated pthread function
+-  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  endif  // HAVE_PTHREAD_MUTEXATTR_SETTYPE
+ # endif  // __LSB__
+ 
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index f3a315e821c..e32b98690a2 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -1,15 +1,21 @@
 # Template file for 'xastir'
 pkgname=xastir
-version=2.1.6
+version=2.1.8
 revision=1
-archs="i686 x86_64 ppc64le"
 build_style=gnu-configure
-makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel motif-devel libax25-devel"
+configure_args="ac_cv_file__usr_bin_gm_exe=no ac_cv_file__usr_bin_convert_exe=no"
+hostmakedepends="autoconf automake"
+makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel
+ motif-devel libax25-devel"
 short_desc="X Amateur Station Tracking and Information Reporting"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xastir.org"
 distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
-checksum=5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e
+checksum=aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	./bootstrap.sh
+}