diff --git a/mariadb.spec b/mariadb.spec
index 2973cd2..6b176ce 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -220,10 +220,12 @@ Patch9:           %{pkgnamepatch}-ownsetup.patch
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
 #   Patch11: Use PCDIR CMake option, if configured
 Patch11:          %{pkgnamepatch}-pcdir.patch
+#   Patch12: OpenSSL 3 patch
+#   Picked from the upstream developement branch for MariaDB 10.8.
+#   https://jira.mariadb.org/browse/MDEV-25785
+Patch12:           %{pkgnamepatch}-openssl3.patch
 #   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
 Patch15:          %{pkgnamepatch}-groonga.patch
-#   Patch16:  Fix openssl 3.0 compatibility at least partially (some tests still fail)
-Patch16:          %{pkgnamepatch}-openssl3.patch
 
 BuildRequires:    make
 BuildRequires:    cmake gcc-c++
@@ -751,8 +753,10 @@ rm -r storage/rocksdb/
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
+%patch12 -p1
+%endif
 %patch15 -p1
-%patch16 -p1
 
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests