diff --git a/extras/dovecot/dovecot.spec b/extras/dovecot/dovecot.spec
index 6201dc9..4e13663 100644
--- a/extras/dovecot/dovecot.spec
+++ b/extras/dovecot/dovecot.spec
@@ -7,7 +7,7 @@ Epoch: 1
 %global minor 21
 Version: %{major}.%{minor}
 #global prever .rc1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -78,11 +78,8 @@ BuildRequires: devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-build devtools
 BuildRequires: gcc gcc-c++
 BuildRequires: libxcrypt-devel
 %endif
-%if 0%{?rhel} >= 9
-BuildRequires: openssl-devel
-%else
-BuildRequires: openssl3-devel
-%endif
+
+BuildRequires: pkgconfig(openssl) >= 3.0
 
 BuildRequires: quota-devel
 
@@ -252,6 +249,7 @@ export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fno-strict-aliasing"
 %endif
 %if 0%{?rhel} > 6
     --with-lucene                \
+    --with-exttextcat            \
 %endif
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
@@ -316,6 +314,7 @@ chmod 600 $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem
 
 %if 0%{?rhel} > 6
 install -p -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf
+install -p -D -m 644 dovecot-init.service $RPM_BUILD_ROOT%{_unitdir}/dovecot-init.service
 %else
 install -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
 install -p -D -m 600 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dovecot
@@ -454,7 +453,7 @@ make check
 %if 0%{?rhel} > 6
 %_tmpfilesdir/dovecot.conf
 %{_unitdir}/dovecot.service
-#%{_unitdir}/dovecot-init.service
+%{_unitdir}/dovecot-init.service
 %{_unitdir}/dovecot.socket
 %else
 %{_initddir}/dovecot
@@ -601,6 +600,9 @@ make check
 %{_libdir}/dovecot/auth/libauthdb_lua.so
 
 %changelog
+* Wed Feb 21 2024 Raven <raven@sysadmins.ws> - 1:2.3.21-2
+- revert back dovecot-init.service
+
 * Wed Jun 21 2023 Raven <raven@sysadmins.ws> - 1:2.3.20-1
 - Dovecot to 2.3.20