diff --git a/SOURCES/mod_http2-1.15.7-SNI.patch b/SOURCES/mod_http2-1.15.7-SNI.patch
new file mode 100644
index 0000000..5410aa3
--- /dev/null
+++ b/SOURCES/mod_http2-1.15.7-SNI.patch
@@ -0,0 +1,25 @@
+commit 0686f5d00a4b5a54238a1979f8e61d179adf2ea9
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Thu Sep 22 14:56:24 2022 +0200
+
+    Backport refactor of SNI feature
+
+diff --git a/mod_http2/mod_proxy_http2.c b/mod_http2/mod_proxy_http2.c
+index 83ae431..2208707 100644
+--- a/mod_http2/mod_proxy_http2.c
++++ b/mod_http2/mod_proxy_http2.c
+@@ -403,14 +403,6 @@ run_connect:
+          */
+         apr_table_setn(ctx->p_conn->connection->notes,
+                        "proxy-request-alpn-protos", "h2");
+-        if (ctx->p_conn->ssl_hostname) {
+-            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctx->owner,
+-                          "set SNI to %s for (%s)",
+-                          ctx->p_conn->ssl_hostname,
+-                          ctx->p_conn->hostname);
+-            apr_table_setn(ctx->p_conn->connection->notes,
+-                           "proxy-request-hostname", ctx->p_conn->ssl_hostname);
+-        }
+     }
+ 
+     if (ctx->master->aborted) goto cleanup;
diff --git a/SPECS/mod_http2.spec b/SPECS/mod_http2.spec
index 7920cb4..be36599 100644
--- a/SPECS/mod_http2.spec
+++ b/SPECS/mod_http2.spec
@@ -3,7 +3,7 @@
 
 Name:		mod_http2
 Version:	1.15.7
-Release:	5%{?dist}.4
+Release:	8%{?dist}.3
 Summary:	module implementing HTTP/2 for Apache 2
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -13,12 +13,13 @@ Patch1:		mod_http2-1.15.7-CVE-2020-9490.patch
 Patch2:		mod_http2-1.15.7-CVE-2020-11993.patch
 Patch3:		mod_http2-1.15.7-CVE-2021-33193.patch
 Patch4:		mod_http2-1.15.7-CVE-2021-44224.patch
+Patch5:		mod_http2-1.15.7-SNI.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2176209
-Patch5:         mod_http2-1.15.7-CVE-2023-25690.patch
+Patch6:		mod_http2-1.15.7-CVE-2023-25690.patch
+
 BuildRequires:	pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2
 Requires:	httpd-mmn = %{_httpd_mmn}
-Conflicts:      httpd < 2.4.25-8
-
+Conflicts:      httpd < 2.4.37-55
 
 %description
 The mod_h2 Apache httpd module implements the HTTP2 protocol (h2+h2c) on
@@ -30,7 +31,8 @@ top of libnghttp2 for httpd 2.4 servers.
 %patch2 -p1 -b .CVE-2020-11993
 %patch3 -p1 -b .CVE-2021-33193
 %patch4 -p1 -b .CVE-2021-44224
-%patch5 -p1 -b .CVE-2023-25690
+%patch5 -p1 -b .SNI
+%patch6 -p1 -b .CVE-2023-25690
 
 %build
 %configure
@@ -57,10 +59,17 @@ make check
 %{_httpd_moddir}/mod_proxy_http2.so
 
 %changelog
-* Sat Mar 18 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.15.7-5.4
-- Resolves: #2177747 - CVE-2023-25690 httpd:2.4/httpd: HTTP request splitting
+* Sat Mar 18 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.15.7-8.3
+- Resolves: #2177748 - CVE-2023-25690 httpd:2.4/httpd: HTTP request splitting
   with mod_rewrite and mod_proxy
 
+* Thu Dec 08 2022 Luboš Uhliarik <luhliari@redhat.com> - 1.15.7-7
+- Resolves: #2095650 - Dependency from mod_http2 on httpd broken
+
+* Tue Nov 01 2022 Tomas Korbar <tkorbar@redhat.com> - 1.15.7-6
+- Backport SNI feature refactor
+- Resolves: rhbz#2137257
+
 * Mon Jan 24 2022 Luboš Uhliarik <luhliari@redhat.com> - 1.15.7-5
 - Resolves: #2035030 - CVE-2021-44224 httpd:2.4/httpd: possible NULL dereference
   or SSRF in forward proxy configurations