diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 04749693e8db..5c3f6329afb5 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	fts-xapian
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
 MAINTAINER=	juraj@lutter.sk
 COMMENT=	Dovecot FTS plugin based on Xapian
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libicuuc.so:devel/icu \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 
 USES=		autoreconf compiler:c++11-lang libtool pkgconfig
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grosjo
 
 GNU_CONFIGURE=	yes
 
 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 50be73d64e2c..6e0eef78764c 100644
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603446932
-SHA256 (grosjo-fts-xapian-1.4.1_GH0.tar.gz) = 219ce1a0cb261745ec005156a6b9e3cdd47319750736eab727132b1c222cd7c2
-SIZE (grosjo-fts-xapian-1.4.1_GH0.tar.gz) = 27633
+TIMESTAMP = 1604301654
+SHA256 (grosjo-fts-xapian-1.4.2_GH0.tar.gz) = 11ff20bd91d81754bbe4f9ad52cf1fd74be8c3bb8633a7023a35cf4cc3c18c58
+SIZE (grosjo-fts-xapian-1.4.2_GH0.tar.gz) = 27812
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..9e0a1eba892a
--- /dev/null
+++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
@@ -0,0 +1,13 @@
+--- src/fts-backend-xapian.cpp.orig	2020-11-02 07:45:52 UTC
++++ src/fts-backend-xapian.cpp
+@@ -11,8 +11,8 @@ extern "C" {
+ 
+ #define XAPIAN_FILE_PREFIX "xapian-indexes"
+ #define XAPIAN_TERM_SIZELIMIT 245
+-#define XAPIAN_COMMIT_ENTRIES 1000000
+-#define XAPIAN_COMMIT_TIMEOUT 300
++#define XAPIAN_COMMIT_ENTRIES 1000000L
++#define XAPIAN_COMMIT_TIMEOUT 300L
+ #define XAPIAN_COMMIT_MEMORY 10240
+ #define XAPIAN_WILDCARD "wldcrd"
+ #define XAPIAN_EXPUNGE_SIZE 3