diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index cf82990d73b8..83095591a518 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	notmuch
-DISTVERSION=	0.38.3
+DISTVERSION=	0.39
 PORTREVISION?=	0
 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 58773db44bd3..a322f96e2fff 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711201991
-SHA256 (notmuch-0.38.3.tar.xz) = 9af46cc80da58b4301ca2baefcc25a40d112d0315507e632c0f3f0f08328d054
-SIZE (notmuch-0.38.3.tar.xz) = 805416
+TIMESTAMP = 1742761610
+SHA256 (notmuch-0.39.tar.xz) = b88bb02a76c46bad8d313fd2bb4f8e39298b51f66fcbeb304d9f80c3eef704e3
+SIZE (notmuch-0.39.tar.xz) = 811448
diff --git a/mail/notmuch/files/patch-bindings_python_docs_source_conf.py b/mail/notmuch/files/patch-contrib_python-legacy_docs_source_conf.py
similarity index 79%
rename from mail/notmuch/files/patch-bindings_python_docs_source_conf.py
rename to mail/notmuch/files/patch-contrib_python-legacy_docs_source_conf.py
index 8ed1ee25b2b2..f842a45185c5 100644
--- a/mail/notmuch/files/patch-bindings_python_docs_source_conf.py
+++ b/mail/notmuch/files/patch-contrib_python-legacy_docs_source_conf.py
@@ -1,23 +1,23 @@
---- bindings/python/docs/source/conf.py.orig	2019-03-02 23:40:44 UTC
-+++ bindings/python/docs/source/conf.py
-@@ -13,7 +13,19 @@
+--- contrib/python-legacy/docs/source/conf.py.orig	2025-03-15 22:04:35 UTC
++++ contrib/python-legacy/docs/source/conf.py
+@@ -13,7 +13,19 @@ import sys, os
  
  import sys, os
  
 -from unittest.mock import Mock
 +try:
 +    from unittest.mock import Mock
 +except ImportError:
 +    class Mock(object):
 +        def __init__(self, *args, **kwargs):
 +            pass
 +
 +        def __call__(self, *args, **kwargs):
 +            return Mock()
 +
 +        @classmethod
 +        def __getattr__(self, name):
 +            return Mock() if name not in ('__file__', '__path__') else '/dev/null'
  
  # If extensions (or modules to document with autodoc) are in another directory,
  # add these directories to sys.path here. If the directory is relative to the
diff --git a/mail/py-notmuch/Makefile b/mail/py-notmuch/Makefile
index 7fdf191045ca..d7902552824c 100644
--- a/mail/py-notmuch/Makefile
+++ b/mail/py-notmuch/Makefile
@@ -1,32 +1,32 @@
 PORTREVISION=	1
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python interface for the Notmuch email search and tagging library
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 
 USES=		python uniquefiles:dirs
 USE_PYTHON=	autoplist distutils
 
 MASTERDIR=	${.CURDIR}/../notmuch
 NO_ARCH=	yes
 PORTDOCS=	*
-WRKSRC_SUBDIR=	bindings/python
+WRKSRC_SUBDIR=	contrib/python-legacy
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 do-build-DOCS-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs html
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
 .include "${MASTERDIR}/Makefile"