diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
index 7e7f7c998d..b070351522 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
@@ -24,6 +24,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	${FILESDIR}/bug-887887_allow-O2-override.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
index ac10858949..1267136e38 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
@@ -36,6 +36,10 @@ if [ "$PV" = 9999 ] ; then
 	"
 fi
 
+PATCHES=(
+	${FILESDIR}/bug-887887_allow-O2-override.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch b/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch
new file mode 100644
index 0000000000..5c4b95fb35
--- /dev/null
+++ b/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2022-04-17 07:41:11.000000000 -0400
++++ b/configure.ac	2022-12-25 13:24:02.551681208 -0500
+@@ -21,7 +21,7 @@
+ DC_DOVECOT
+ DC_DOVECOT_MODULEDIR
+ LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS $DOVECOT_FLAGS -O2"
++CFLAGS="-O2 $CFLAGS $EXTRA_CFLAGS $DOVECOT_FLAGS"
+ LIBS="$DOVECOT_LIBS"
+ BINARY_LDFLAGS="$PIE_LDFLAGS $RELRO_LDFLAGS"
+ BINARY_CFLAGS="$PIE_CFLAGS"