diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index ed04d5a34169..0756d855975c 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	fts-xapian
-DISTVERSION=	1.5.1
-PORTREVISION=	1
+DISTVERSION=	1.5.4
+DISTVERSIONSUFFIX=      b
 CATEGORIES=	mail
-MASTER_SITES=	https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSION}/
+MASTER_SITES=	https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSIONFULL}/
 PKGNAMEPREFIX=	dovecot-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Dovecot FTS plugin based on Xapian
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core
 RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 
-USES=		autoreconf compiler:c++11-lang libtool pkgconfig
+USES=		autoreconf compiler:c++11-lang libtool pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL}
 
 PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
 		lib/dovecot/lib21_fts_xapian_plugin.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo
index e7e0d0262582..b49a38017d7d 100644
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636662908
-SHA256 (dovecot-fts-xapian-1.5.1.tar.gz) = 12b610492849440b96fc8527a98cd537fe14465c4e618eacfd9651101e343f2e
-SIZE (dovecot-fts-xapian-1.5.1.tar.gz) = 2896670
+TIMESTAMP = 1648195324
+SHA256 (dovecot-fts-xapian-1.5.4b.tar.gz) = cfc60caade77aadc8441b971d2e49f7337033a1e83494163cd8abcd459c79f6d
+SIZE (dovecot-fts-xapian-1.5.4b.tar.gz) = 33138
diff --git a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
new file mode 100644
index 000000000000..bab0275d4914
--- /dev/null
+++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
@@ -0,0 +1,13 @@
+Patch to silence a warning, until adopted by upstream (issue #101)
+
+--- src/fts-backend-xapian.cpp.orig	2022-03-25 21:16:29 UTC
++++ src/fts-backend-xapian.cpp
+@@ -750,7 +750,7 @@ struct fts_backend fts_backend_xapian =
+ {
+ 	.name = "xapian",
+ 	.flags = FTS_BACKEND_FLAG_BUILD_FULL_WORDS,
+-	{
++	.v = {
+ 		fts_backend_xapian_alloc,
+ 		fts_backend_xapian_init,
+ 		fts_backend_xapian_deinit,