diff --git a/dovecot.spec b/dovecot.spec
index 7048160..189635e 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -6,7 +6,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.3.21
 %global prever %{nil}
-Release: 7%{?dist}
+Release: 8%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT AND LGPL-2.1-only
 
@@ -76,7 +76,6 @@ BuildRequires: libicu-devel
 BuildRequires: libexttextcat-devel
 BuildRequires: clucene-core-devel
 %endif
-BuildRequires: libstemmer-devel
 BuildRequires: multilib-rpm-config
 BuildRequires: flex, bison
 BuildRequires: systemd-devel
@@ -208,6 +207,7 @@ autoreconf -I . -fiv #required for aarch64 support
     --without-lucene             \
     --without-exttextcat         \
 %endif
+    --without-libstemmer         \
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
     --with-solr                  \
@@ -504,6 +504,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Tue Jun 11 2024 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.21-8
+- drop dependency on libstemmer (#RHEL-40657)
+
 * Mon May 13 2024 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.21-7
 - do not use deprecated openssl v3 engine api (#RHEL-33733)
 
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..16d63b0
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+