diff --git a/mail/notmuch-emacs/pkg-plist b/mail/notmuch-emacs/pkg-plist
index 0a3df64e17dd..7680c80bbc11 100644
--- a/mail/notmuch-emacs/pkg-plist
+++ b/mail/notmuch-emacs/pkg-plist
@@ -1,46 +1,47 @@
 %%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
 %%EMACS_SITE_LISPDIR%%/coolj.el.gz
 %%EMACS_SITE_LISPDIR%%/coolj.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-address.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-address.elc
+%%EMACS_SITE_LISPDIR%%/notmuch-autoloads.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-company.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-company.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-compat.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-crypto.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-draft.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-draft.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-hello.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-hello.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-jump.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-jump.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-lib.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-lib.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-logo.svg
 %%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-message.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-message.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-mua.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-mua.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-parser.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-parser.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-print.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-print.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-query.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-query.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-show.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-show.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-tag.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-tag.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-tree.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-tree.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-version.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-version.elc
 %%EMACS_SITE_LISPDIR%%/notmuch-wash.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch-wash.elc
 %%EMACS_SITE_LISPDIR%%/notmuch.el.gz
 %%EMACS_SITE_LISPDIR%%/notmuch.elc
 %%MANPAGES%%share/man/man1/notmuch-emacs-mua.1.gz
 bin/notmuch-emacs-mua
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 7d74916fcfad..bf966a64c91f 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,90 +1,89 @@
 PORTNAME=	notmuch
-DISTVERSION=	0.39
-PORTREVISION?=	1
+DISTVERSION=	0.40
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT?=	Thread-based email index, search and tagging application
 WWW?=		https://notmuchmail.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
 .ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libsexp.so:devel/sfsexp \
 		libtalloc.so:devel/talloc \
 		libxapian.so:databases/xapian-core
 TEST_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb \
 		bash:shells/bash \
 		dtach:misc/dtach \
 		emacs:editors/emacs@nox \
 		gbase64:sysutils/coreutils \
 		gdate:sysutils/coreutils \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gwc:sysutils/coreutils
 
 USES=		gmake gnome pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
 
 USES+=		tar:xz
 
 .ifndef MASTERDIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${PREFIX}/share/man \
 		--prefix=${PREFIX} \
 		--with-bash-completion \
 		--with-retry-lock \
 		--with-zsh-completion \
 		--without-emacs
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		TEST_GDB=${LOCALBASE}/bin/gdb \
 		V=1
 TEST_TARGET=	test
 .endif
 
 PKGDIR=		${.CURDIR}
 .ifndef MASTERDIR
 PORTSCOUT=	limit:^[0-9\.]*$$
 .endif
 
 PATCH_WRKSRC=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}
 
 .ifndef MASTERDIR
 OPTIONS_DEFINE=		DOXYGEN MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_USES=			perl5
 DOXYGEN_CONFIGURE_WITH=		api-docs
 MANPAGES_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
 # Install bash completions without incurring a dependency on
 # shells/bash-completion.
 post-configure:
 	${REINPLACE_CMD} \
 		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
 		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
 		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
 		${WRKSRC}/Makefile.config
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
 
 # Keep poudriere-testport(8) happy.
 post-install-MANPAGES-on:
 	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/notmuch-emacs-mua.1.gz
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index a322f96e2fff..4611dcb1282a 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742761610
-SHA256 (notmuch-0.39.tar.xz) = b88bb02a76c46bad8d313fd2bb4f8e39298b51f66fcbeb304d9f80c3eef704e3
-SIZE (notmuch-0.39.tar.xz) = 811448
+TIMESTAMP = 1771432653
+SHA256 (notmuch-0.40.tar.xz) = 4b4314bbf1c2029fdf793637e6c7bb15c1b1730d22be9aa04803c98c5bbc446f
+SIZE (notmuch-0.40.tar.xz) = 815476
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index c576dfb61f5b..8af6a56335cb 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -1,30 +1,30 @@
 %%DOXYGEN%%share/man/man3/notmuch.3.gz
 %%MANPAGES%%share/man/man1/notmuch-address.1.gz
 %%MANPAGES%%share/man/man1/notmuch-compact.1.gz
 %%MANPAGES%%share/man/man1/notmuch-config.1.gz
 %%MANPAGES%%share/man/man1/notmuch-count.1.gz
 %%MANPAGES%%share/man/man1/notmuch-dump.1.gz
 %%MANPAGES%%share/man/man1/notmuch-insert.1.gz
 %%MANPAGES%%share/man/man1/notmuch-new.1.gz
 %%MANPAGES%%share/man/man1/nmbug.1.gz
 %%MANPAGES%%share/man/man1/notmuch-git.1.gz
 %%MANPAGES%%share/man/man1/notmuch-reindex.1.gz
 %%MANPAGES%%share/man/man1/notmuch-reply.1.gz
 %%MANPAGES%%share/man/man1/notmuch-restore.1.gz
 %%MANPAGES%%share/man/man1/notmuch-search.1.gz
 %%MANPAGES%%share/man/man1/notmuch-setup.1.gz
 %%MANPAGES%%share/man/man1/notmuch-show.1.gz
 %%MANPAGES%%share/man/man1/notmuch-tag.1.gz
 %%MANPAGES%%share/man/man1/notmuch.1.gz
 %%MANPAGES%%share/man/man5/notmuch-hooks.5.gz
 %%MANPAGES%%share/man/man7/notmuch-properties.7.gz
 %%MANPAGES%%share/man/man7/notmuch-search-terms.7.gz
 %%MANPAGES%%share/man/man7/notmuch-sexp-queries.7.gz
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.5
-lib/libnotmuch.so.5.6.0
+lib/libnotmuch.so.5.7.0
 share/bash-completion/completions/notmuch
 share/zsh/site-functions/_email-notmuch
 share/zsh/site-functions/_notmuch