diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index bfc9ac4e4b26..7c33f901c194 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -38,7 +38,7 @@ PORTSCOUT=	limit:^[0-9\.]*$$
 
 # fake ./configure to avoid unneeded dependencies
 do-configure:
-	@${CP} ${WRKSRC}/version ${WRKSRC}/version.stamp
+	@${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp
 	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
 	@${PRINTF} \
 		'%s\n' \
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index a642644cdfbe..63eec3787690 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.31
+PORTVERSION=	0.31.2
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 118a77c51f25..cc871000c894 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599486775
-SHA256 (notmuch-0.31.tar.xz) = 571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394
-SIZE (notmuch-0.31.tar.xz) = 713144
+TIMESTAMP = 1605443751
+SHA256 (notmuch-0.31.2.tar.xz) = 1456b63e04637094eefe7e6f9a45812ed419392a0322fe8b0f452dd06a4cfbef
+SIZE (notmuch-0.31.2.tar.xz) = 713388