diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d9eef47d0b0..64a648ce829 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.31
-revision=2
+version=0.31.2
+revision=1
 hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
  python3-cffi python3-setuptools gnupg2"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394
+checksum="1456b63e04637094eefe7e6f9a45812ed419392a0322fe8b0f452dd06a4cfbef
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 
@@ -34,7 +34,6 @@ else
 fi
 
 do_configure() {
-	ln -sf /usr/bin/gpg2 $XBPS_WRAPPERDIR/gpg
 	./configure --prefix=/usr \
 		--bashcompletiondir=/usr/share/bash-completion/completions \
 		--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -48,10 +47,9 @@ do_build() {
 }
 
 do_check() {
-	# We want wrapper-dirs included for gpg being gpg2
-	# But we don't want to use date wrapper in check
-	unset SOURCE_DATE_EPOCH
-	PATH=$XBPS_WRAPPERDIR:$PATH
+	mkdir -p fake-bin
+	ln -sf /usr/bin/gpg2 fake-bin/gpg
+	PATH=$PWD/fake-bin:$PATH
 	cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
 		test/test-databases
 	case "$XBPS_TARGET_LIBC" in