diff --git a/common/shlibs b/common/shlibs
index b995f4c087f..b6c7ee27ff3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1423,7 +1423,7 @@ libgoffice-0.8.so.8 goffice0.8-0.8.13_1
 libgoffice-0.10.so.10 goffice-0.10.9_1
 libc++.so.1 libcxx-3.4_1
 libopenobex.so.2 openobex-1.7.1_1
-libnotmuch.so.4 libnotmuch-0.19_1
+libnotmuch.so.5 libnotmuch-0.25_1
 libdri2.so.1 libdri2-0.1_1
 libUMP.so.3 libump-1.0_1
 libatomic_ops_gpl.so.1 libatomic_ops-7.4.2_1
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
new file mode 100644
index 00000000000..a1f3f6e157c
--- /dev/null
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -0,0 +1,11 @@
+--- configure.orig
++++ configure
+@@ -370,7 +370,7 @@
+     return 0;
+ }
+ EOF
+-if ${CC} ${CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
++if ${BUILD_CC} ${BUILD_CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
+        && ./_libversion > _libversion.sh && . ./_libversion.sh
+ then
+     printf "OK.\n"
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 57cc8d2d117..30ef5614e29 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.24.2
+version=0.25
 revision=1
 hostmakedepends="pkg-config perl python-Sphinx"
 makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion"
@@ -9,9 +9,7 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3"
 homepage="http://notmuchmail.org"
 distfiles="http://http.debian.net/debian/pool/main/n/notmuch/notmuch_${version}.orig.tar.gz"
-checksum=aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
-
-nocross="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6341/steps/shell_3/logs/stdio"
+checksum=65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
 
 subpackages="libnotmuch libnotmuch-devel notmuch-mutt"
 case "$XBPS_TARGET_MACHINE" in