diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index 01444bfe874c..fb977ccd3586 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,75 +1,74 @@
-PORTREVISION=	1
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	notmuch:mail/notmuch
 
 USES=		emacs gmake
 
 INSTALL_TARGET=	install-emacs
 MASTERDIR=	${.CURDIR}/../notmuch
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DESKTOP DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 DESKTOP_DESC=	Install .desktop file for notmuch-emacs-mua
 
 DESKTOP_CONFIGURE_ON=	WITH_DESKTOP=1
 DESKTOP_USES=	desktop-file-utils
 DOCS_ALL_TARGET=	build-info
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_CONFIGURE_ON=	HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1
 DOCS_INFO=	notmuch-emacs
 DOCS_INSTALL_TARGET=	install-info
 DOCS_USES=	makeinfo
 MANPAGES_ALL_TARGET=	build-man
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	HAVE_SPHINX=1
 MANPAGES_INSTALL_TARGET=	install-man
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 # fake ./configure to avoid unneeded dependencies
 do-configure:
 	@${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp
 	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
 	@${PRINTF} \
 		'%s\n' \
 		BASH_ABSOLUTE=/bin/sh \
 		desktop_dir=${PREFIX}/share/applications \
 		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 		HAVE_BASH=1 \
 		HAVE_EMACS=1 \
 		infodir=${PREFIX}/${INFO_PATH} \
 		mandir=${MANPREFIX}/man \
 		NOTMUCH_SRCDIR=${WRKSRC} \
 		prefix=${PREFIX} \
 		srcdir=. \
 		subdirs='doc emacs' \
 		WITH_EMACS=1 \
 		${CONFIGURE_ARGS} \
 		> ${WRKSRC}/Makefile.config
 	@${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \
 		> ${WRKSRC}/sphinx.config
 
 post-install:
 	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
 
 # keep poudriere testport happy
 post-install-DOCS-on:
 	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete
 
 post-install-MANPAGES-on:
 	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete
 
 # modify what Mk/Uses/emacs.mk set
 MAKE_ARGS+=	EMACS+=--quick
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index d8a4fba454cc..1d037fdf84ac 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,92 +1,92 @@
 # Created by: DarwinSurvivor <darwinsurvivor@gmail.com>
 
 PORTNAME=	notmuch
-PORTVERSION=	0.33
+PORTVERSION=	0.33.2
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT?=	Thread-based email index, search and tagging application
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
 .ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libxapian.so:databases/xapian-core \
 		libtalloc.so:devel/talloc
 TEST_DEPENDS=	bash:shells/bash \
 		emacs:editors/emacs@nox \
 		dtach:misc/dtach \
 		gdate:sysutils/coreutils \
 		gbase64:sysutils/coreutils \
 		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gpg:security/gnupg \
 		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
 USES=		compiler:c++11-lang gmake gnome pkgconfig python:3.5+,build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
 
 USES+=		tar:xz
 
 .ifndef MASTERDIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${MANPREFIX}/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
 
 PATCH_WRKSRC=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}
 PKGDIR=		${.CURDIR}
 
 .ifndef MASTERDIR
 OPTIONS_DEFINE=	DOXYGEN MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_WITH=	api-docs
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 # 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:
 	${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}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index ef871146e20f..e7f02d36d60a 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630778344
-SHA256 (notmuch-0.33.tar.xz) = 883e045b4bfa2c48c9a4671062a40603a7f6165724dd54618beeba100549d26c
-SIZE (notmuch-0.33.tar.xz) = 730764
+TIMESTAMP = 1633294524
+SHA256 (notmuch-0.33.2.tar.xz) = 244892f6ab52a84f6b013b387cd6652d461effd36b14ef9e576604b5850b2cae
+SIZE (notmuch-0.33.2.tar.xz) = 733228