diff --git a/mail/Makefile b/mail/Makefile
index e416ac13f4cb..af4fd9afee54 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -94,6 +94,7 @@
     SUBDIR += dma
     SUBDIR += dot-forward
     SUBDIR += dovecot
+    SUBDIR += dovecot-fts-flatcurve
     SUBDIR += dovecot-fts-xapian
     SUBDIR += dovecot-pigeonhole
     SUBDIR += dspam
diff --git a/mail/dovecot-fts-flatcurve/Makefile b/mail/dovecot-fts-flatcurve/Makefile
new file mode 100644
index 000000000000..993bc4d4a6f6
--- /dev/null
+++ b/mail/dovecot-fts-flatcurve/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	fts-flatcurve
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.2.0
+CATEGORIES=	mail
+PKGNAMEPREFIX=	dovecot-
+
+MAINTAINER=	martin@waschbuesch.de
+COMMENT=	Dovecot FTS plugin based on Xapian
+
+LICENSE=	LGPL21
+
+BUILD_DEPENDS=	dovecot>=2.3.10:mail/dovecot
+LIB_DEPENDS=	libicuuc.so:devel/icu \
+		libxapian.so:databases/xapian-core
+RUN_DEPENDS=	dovecot>=2.3.10:mail/dovecot
+
+USES=		autoreconf libtool pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	slusarz
+GH_PROJECT=	dovecot-fts-flatcurve
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	include/dovecot-fts-flatcurve/fts-flatcurve-config.h \
+		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.a \
+		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so \
+		lib/dovecot/lib21_fts_flatcurve_plugin.a \
+		lib/dovecot/lib21_fts_flatcurve_plugin.so
+
+post-install:
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_flatcurve_plugin.so
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so
+
+.include <bsd.port.mk>
diff --git a/mail/dovecot-fts-flatcurve/distinfo b/mail/dovecot-fts-flatcurve/distinfo
new file mode 100644
index 000000000000..7eedfa15a1a0
--- /dev/null
+++ b/mail/dovecot-fts-flatcurve/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1644170033
+SHA256 (slusarz-dovecot-fts-flatcurve-v0.2.0_GH0.tar.gz) = 19cb4eb6ce72e8789f12d4e31d068ca79d1b38f199d36120336c74c3ad55ab5c
+SIZE (slusarz-dovecot-fts-flatcurve-v0.2.0_GH0.tar.gz) = 48956
diff --git a/mail/dovecot-fts-flatcurve/files/patch-src_Makefile.am b/mail/dovecot-fts-flatcurve/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..9dd4d8c2e908
--- /dev/null
+++ b/mail/dovecot-fts-flatcurve/files/patch-src_Makefile.am
@@ -0,0 +1,16 @@
+--- src/Makefile.am.orig	2022-01-14 06:31:24 UTC
++++ src/Makefile.am
+@@ -5,10 +5,11 @@ AM_CPPFLAGS = \
+ 	$(LIBDOVECOT_STORAGE_INCLUDE) \
+ 	$(LIBDOVECOT_DOVEADM_INCLUDE) \
+ 	$(LIBDOVECOT_FTS_INCLUDE) \
+-	$(XAPIAN_INCLUDE)
++	$(XAPIAN_INCLUDE) \
++	$(XAPIAN_CXXFLAGS)
+ 
+ AM_CXXFLAGS = \
+-	$(XAPIAN_LIBS)
++	$(XAPIAN_LIBS) $(XAPIAN_CXXFLAGS)
+ 
+ lib21_doveadm_fts_flatcurve_plugin_la_LDFLAGS = -module -avoid-version
+ lib21_fts_flatcurve_plugin_la_LDFLAGS = -module -avoid-version
diff --git a/mail/dovecot-fts-flatcurve/pkg-descr b/mail/dovecot-fts-flatcurve/pkg-descr
new file mode 100644
index 000000000000..f97b16b215b8
--- /dev/null
+++ b/mail/dovecot-fts-flatcurve/pkg-descr
@@ -0,0 +1,12 @@
+This is a Dovecot FTS plugin to enable message indexing using the Xapian
+Open Source Search Engine Library.
+
+The plugin relies on Dovecot to do the necessary stemming.
+It is intended to act as a simple interface to the Xapian 
+storage/search query functionality.
+
+This driver supports match scoring and substring matches (on by 
+default), which means it is RFC 3501 (IMAP4rev1) compliant.
+This driver does not support fuzzy searches.
+
+WWW: https://github.com/slusarz/dovecot-fts-flatcurve