diff --git a/deps/patches/ofi/0001_71caa804137c07a3589f69fdb7ea220c2bbe5cbf.patch b/deps/patches/ofi/0001_71caa804137c07a3589f69fdb7ea220c2bbe5cbf.patch
new file mode 100644
index 00000000000..ef1e43a7fd2
--- /dev/null
+++ b/deps/patches/ofi/0001_71caa804137c07a3589f69fdb7ea220c2bbe5cbf.patch
@@ -0,0 +1,54 @@
+diff --git a/prov/opx/include/fi_opx_tid_cache.h b/prov/opx/include/fi_opx_tid_cache.h
+index de2e30043..0b9d2a90b 100644
+--- a/prov/opx/include/fi_opx_tid_cache.h
++++ b/prov/opx/include/fi_opx_tid_cache.h
+@@ -49,8 +49,8 @@
+ int opx_tid_cache_setup(struct ofi_mr_cache **cache,
+ 			struct opx_tid_domain *domain);
+ 
+-int opx_tid_cache_add_abort();
+-void opx_tid_cache_delete_abort();
++int opx_tid_cache_add_abort(struct ofi_mr_cache *cache, struct ofi_mr_entry *entry);
++void opx_tid_cache_delete_abort(struct ofi_mr_cache *cache, struct ofi_mr_entry *entry);
+ 
+ enum opx_tid_cache_entry_status {
+ 	OPX_TID_CACHE_ENTRY_NOT_FOUND = 0,
+diff --git a/prov/opx/include/rdma/opx/fi_opx.h b/prov/opx/include/rdma/opx/fi_opx.h
+index 1b344d23a..5a634f773 100644
+--- a/prov/opx/include/rdma/opx/fi_opx.h
++++ b/prov/opx/include/rdma/opx/fi_opx.h
+@@ -271,7 +271,7 @@ static inline void always_assert (bool val, char *msg)
+ // Useful for checking that structures are the correct size and other
+ // compile-time tests. static_assert has existed since C11 so this
+ // should be safe, but we have an else clause just in case.
+-#if defined(static_assert)
++#if __STDC_VERSION__ >= 201112L
+ #define OPX_COMPILE_TIME_ASSERT(cond, msg) static_assert(cond,msg)
+ #else
+ #define OPX_COMPILE_TIME_ASSERT(cond, msg) if(0){switch(0){case 0:case cond:;}}
+diff --git a/prov/opx/src/fi_opx_tid_cache.c b/prov/opx/src/fi_opx_tid_cache.c
+index 660607114..7892fb0d5 100644
+--- a/prov/opx/src/fi_opx_tid_cache.c
++++ b/prov/opx/src/fi_opx_tid_cache.c
+@@ -2059,13 +2059,19 @@ void opx_tid_cache_cleanup(struct ofi_mr_cache *cache)
+ 	assert(cache->uncached_size == 0);
+ }
+ 
+-int opx_tid_cache_add_abort(){
++int opx_tid_cache_add_abort(struct ofi_mr_cache *cache, struct ofi_mr_entry *entry)
++{
++	OFI_UNUSED(cache);
++	OFI_UNUSED(entry);
+ 	fprintf(stderr, "%s unexpected function call\n", __func__);
+ 	abort();
+ 	return 0;
+ }
+ 
+-void opx_tid_cache_delete_abort(){
++void opx_tid_cache_delete_abort(struct ofi_mr_cache *cache, struct ofi_mr_entry *entry)
++{
++	OFI_UNUSED(cache);
++	OFI_UNUSED(entry);
+ 	fprintf(stderr, "%s unexpected function call\n", __func__);
+ 	abort();
+ }
diff --git a/utils/build.config b/utils/build.config
index 76f5c0f6fcb..1c104ee77f5 100644
--- a/utils/build.config
+++ b/utils/build.config
@@ -28,4 +28,5 @@ ucx=https://github.com/openucx/ucx.git
 [patch_versions]
 spdk=0001_3428322b812fe31cc3e1d0308a7f5bd4b06b9886.diff,0002_spdk_rwf_nowait.patch,0003_external_isal.patch
 mercury=0001_dep_versions.patch,0002_ofi_counters.patch,0003_ofi_auth_key.patch
+ofi=0001_71caa804137c07a3589f69fdb7ea220c2bbe5cbf.patch
 argobots=0001_411e5b344642ebc82190fd8b125db512e5b449d1.diff,0002_bb0c908abfac4bfe37852eee621930634183c6aa.diff
diff --git a/utils/rpms/libfabric.changelog b/utils/rpms/libfabric.changelog
index b3e780be7bd..8b54f85f249 100644
--- a/utils/rpms/libfabric.changelog
+++ b/utils/rpms/libfabric.changelog
@@ -1,4 +1,7 @@
 %changelog
+* Tue Mar 24 2026 Jeff Olivier <jeffolivier@google.com> - 1-22.0-6
+- Fix gcc 15 build
+
 * Wed Nov 19 2025 Tomasz Gromadzki <tomasz.gromadzki@hpe.com> - 1-22.0-5
 - Restore the RPM changelog, which has not been available since version 1.22.0-2
 
diff --git a/utils/rpms/package_info.sh b/utils/rpms/package_info.sh
index 5be9fb49ac8..849e6d395a2 100644
--- a/utils/rpms/package_info.sh
+++ b/utils/rpms/package_info.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  (C) Copyright 2025 Google LLC
+#  Copyright 2025-2026 Google LLC
 #  Copyright 2025-2026 Hewlett Packard Enterprise Development LP
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -42,7 +42,7 @@ export daos_release
 
 export libfabric_min_version="1.20"
 export libfabric_version="1.22.0"
-export libfabric_release="5${distro_name}"
+export libfabric_release="6${distro_name}"
 export libfabric_full="${libfabric_version}-${libfabric_release}"
 export mercury_version="2.4.1"
 export mercury_release="2${distro_name}"