diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	5
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	notmuch
-DISTVERSION=	0.37
+DISTVERSION=	0.38
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
@@ -27,8 +27,7 @@
 		gsha256sum:sysutils/coreutils \
 		gwc:sysutils/coreutils
 
-USES=		compiler:c++11-lang gmake gnome pkgconfig \
-		python:build,test
+USES=		gmake gnome pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
@@ -70,11 +69,6 @@
 MANPAGES_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
-# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
-post-patch:
-	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
-		${WRKSRC}/*/Makefile.local
-
 # Install bash completions without incurring a dependency on
 # shells/bash-completion.
 post-configure:
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661442742
-SHA256 (notmuch-0.37.tar.xz) = 0e766df28b78bf4eb8235626ab1f52f04f1e366649325a8ce8d3c908602786f6
-SIZE (notmuch-0.37.tar.xz) = 792568
+TIMESTAMP = 1694879133
+SHA256 (notmuch-0.38.tar.xz) = a17901adbe43f481a6bf53c15a2a20268bc8dc7ad5ccf685a0d17c1456dbaf6e
+SIZE (notmuch-0.38.tar.xz) = 804536