diff --git a/_service b/_service
index 072e961..bfafe50 100644
--- a/_service
+++ b/_service
@@ -8,7 +8,7 @@
     <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">8f3a881e08f56ee685d416436fc87fb6b00af332</param>
+    <param name="revision">a2585866c48f041ad941ab503a651d474b9a6d7b</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">libfabric*.tar</param>
diff --git a/fabtests.changes b/fabtests.changes
index 3194fc8..5206dd5 100644
--- a/fabtests.changes
+++ b/fabtests.changes
@@ -1,3 +1,86 @@
+-------------------------------------------------------------------
+Mon Jul  3 16:15:56 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Update to 1.18.1
+  - Core
+    - Fix build warning for ofi_dynpoll_get_fd
+  - EFA
+    - Handle 0-byte writes
+    - Apply byte_in_order_128_byte for all memory type
+    - Increase default shm_av_size to 256
+    - Force handshake before selecting rtm for non-system ifaces.
+    - Only select readbase_rtm when both sides support rdma-read
+    - Bugfix for initializing SHM offload
+    - Correct CPPFLAGS during configure
+    - Make setopt support sendrecv aligned 128 bytes
+    - Make data size to be 128 byte multiples for in-order aligned send/recv
+    - prepare local read pkt entry for in-order aligned send/recv.
+    - Disable gdrcopy and cudamemcpy for in-order aligned recv.
+    - Increase the pad size in rxr_pkt_entry
+    - Make readcopy pkt pool 128 byte aligned
+    - Introduce alignment to support in order aligned ops
+    - Fix a bug when calling ibv_query_qp_data_in_order
+    - RMA operations will ensure FI_ATOMIC cap
+    - RMA operations will ensure FI_RMA cap
+    - Unittest atomics without FI_ATOMIC cap.
+    - Unittest RMA without FI_RMA cap.
+    - Refactor pkt_entry assignment in poll_ibv loop
+    - Fixes for RDMA Write and Writedata
+  - RXM
+    - Revert rxm util peer CQ support
+    - Fix credit size parameter for flow ctrl
+  - SHM
+    - Fix DSA enable
+    - Assert read op and inject proto are mutually exclusive
+    - Fix ROCR data coherency
+    - Add FI_LOCAL_COMM to shm attrs
+    - Signal peer when peer is out of resources
+    - Handle empty freestack
+    - Fix bug in configure.m4 in atomics_happy assignment happy
+    - Add memory barrier before update resp->status for SAR
+    - Fix resource leak reported by coverity
+    - Switch cmd_ctx pool from freestack to bufpool
+    - Add iface parameter to smr_select_proto
+  - TCP
+    - Fix spinning on fi_trywait()
+    - Handle truncation of active message
+    - Handle prefetched data after reporting ETRUNC error
+    - Progress all ep's on unexp_msg_list when posting recv
+    - Removed unused saved_msg::ep field to fix assert
+    - Continue receiving after truncation error
+    - Create function to allocate internal msg buffer
+    - Add runtime setting for max saved message size
+    - Increase default max_saved value
+    - Dynamically allocate large saved Rx buffers
+    - Separate the max inject and recv buf size
+    - Remove 1-line xnet_cq_add_progress function
+    - Changed default wait object to epoll
+    - Handle case where epoll isn't natively supported
+    - Hold domain lock while deregistering memory
+    - Rename DL package from libnet to libtcp
+  - UCX
+    - Align the provider version with the libfabric version
+  - Verbs
+    - Delay device initialization to when fi_getinfo is called
+    - Consolidate peer_mem and dmabuf support check
+    - verbs_nd: Init len to 0 for WCSGetProviderPath call
+    - verbs_nd: Verify CQs are valid in rdma_create_qp
+    - verbs_nd: Initialize ibv_wc fields
+    - verbs_nd: Release lock in network direct error paths
+    - Fix vrb_add_credits signature
+    - Fix credit size parameter for flow ctrl
+    - Recover RXM connection from verbs QP in error state
+  - Fabtests
+    - Add ze-dlopen functions to component tests
+    - Call cudaSetDevice() for selected device
+    - pytest/efa: Adjust get_efa_devices()
+    - pytest/common: Support parallel neuron test
+    - pytest/common: Use different cuda device for parallel cuda set
+    - efa: Test_flood_peer.py increase timeout
+    - pytest/efa: Test to flood peer during startup
+    - fi-rdmabw-xe: Add option to set maximum message size
+    - fi-rdmabw-xe: Add option to set batch size
+
 -------------------------------------------------------------------
 Thu May  4 13:27:21 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/fabtests.spec b/fabtests.spec
index 7340279..b87e5d6 100644
--- a/fabtests.spec
+++ b/fabtests.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define git_ver .0.8f3a881e08f5
+%define git_ver .0.a2585866c48f
 
 Name:           fabtests
-Version:        1.18.0
+Version:        1.18.1
 Release:        0
 Summary:        Test suite for libfabric API
 License:        BSD-2-Clause OR GPL-2.0-only
diff --git a/libfabric-1.18.0.0.8f3a881e08f5.tar.bz2 b/libfabric-1.18.0.0.8f3a881e08f5.tar.bz2
deleted file mode 100644
index 1726c56..0000000
--- a/libfabric-1.18.0.0.8f3a881e08f5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b162231a3e29105f7a4ae61e2764dc2d4c7fbf0bc3057690a089a2b08b872c7
-size 3244939
diff --git a/libfabric-1.18.1.0.a2585866c48f.tar.bz2 b/libfabric-1.18.1.0.a2585866c48f.tar.bz2
new file mode 100644
index 0000000..e893505
--- /dev/null
+++ b/libfabric-1.18.1.0.a2585866c48f.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3512136293265dea9d396c70802c1e1a5e158f0137bb81a381c6142b8e7e974b
+size 3253065
diff --git a/libfabric.changes b/libfabric.changes
index 3194fc8..5206dd5 100644
--- a/libfabric.changes
+++ b/libfabric.changes
@@ -1,3 +1,86 @@
+-------------------------------------------------------------------
+Mon Jul  3 16:15:56 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Update to 1.18.1
+  - Core
+    - Fix build warning for ofi_dynpoll_get_fd
+  - EFA
+    - Handle 0-byte writes
+    - Apply byte_in_order_128_byte for all memory type
+    - Increase default shm_av_size to 256
+    - Force handshake before selecting rtm for non-system ifaces.
+    - Only select readbase_rtm when both sides support rdma-read
+    - Bugfix for initializing SHM offload
+    - Correct CPPFLAGS during configure
+    - Make setopt support sendrecv aligned 128 bytes
+    - Make data size to be 128 byte multiples for in-order aligned send/recv
+    - prepare local read pkt entry for in-order aligned send/recv.
+    - Disable gdrcopy and cudamemcpy for in-order aligned recv.
+    - Increase the pad size in rxr_pkt_entry
+    - Make readcopy pkt pool 128 byte aligned
+    - Introduce alignment to support in order aligned ops
+    - Fix a bug when calling ibv_query_qp_data_in_order
+    - RMA operations will ensure FI_ATOMIC cap
+    - RMA operations will ensure FI_RMA cap
+    - Unittest atomics without FI_ATOMIC cap.
+    - Unittest RMA without FI_RMA cap.
+    - Refactor pkt_entry assignment in poll_ibv loop
+    - Fixes for RDMA Write and Writedata
+  - RXM
+    - Revert rxm util peer CQ support
+    - Fix credit size parameter for flow ctrl
+  - SHM
+    - Fix DSA enable
+    - Assert read op and inject proto are mutually exclusive
+    - Fix ROCR data coherency
+    - Add FI_LOCAL_COMM to shm attrs
+    - Signal peer when peer is out of resources
+    - Handle empty freestack
+    - Fix bug in configure.m4 in atomics_happy assignment happy
+    - Add memory barrier before update resp->status for SAR
+    - Fix resource leak reported by coverity
+    - Switch cmd_ctx pool from freestack to bufpool
+    - Add iface parameter to smr_select_proto
+  - TCP
+    - Fix spinning on fi_trywait()
+    - Handle truncation of active message
+    - Handle prefetched data after reporting ETRUNC error
+    - Progress all ep's on unexp_msg_list when posting recv
+    - Removed unused saved_msg::ep field to fix assert
+    - Continue receiving after truncation error
+    - Create function to allocate internal msg buffer
+    - Add runtime setting for max saved message size
+    - Increase default max_saved value
+    - Dynamically allocate large saved Rx buffers
+    - Separate the max inject and recv buf size
+    - Remove 1-line xnet_cq_add_progress function
+    - Changed default wait object to epoll
+    - Handle case where epoll isn't natively supported
+    - Hold domain lock while deregistering memory
+    - Rename DL package from libnet to libtcp
+  - UCX
+    - Align the provider version with the libfabric version
+  - Verbs
+    - Delay device initialization to when fi_getinfo is called
+    - Consolidate peer_mem and dmabuf support check
+    - verbs_nd: Init len to 0 for WCSGetProviderPath call
+    - verbs_nd: Verify CQs are valid in rdma_create_qp
+    - verbs_nd: Initialize ibv_wc fields
+    - verbs_nd: Release lock in network direct error paths
+    - Fix vrb_add_credits signature
+    - Fix credit size parameter for flow ctrl
+    - Recover RXM connection from verbs QP in error state
+  - Fabtests
+    - Add ze-dlopen functions to component tests
+    - Call cudaSetDevice() for selected device
+    - pytest/efa: Adjust get_efa_devices()
+    - pytest/common: Support parallel neuron test
+    - pytest/common: Use different cuda device for parallel cuda set
+    - efa: Test_flood_peer.py increase timeout
+    - pytest/efa: Test to flood peer during startup
+    - fi-rdmabw-xe: Add option to set maximum message size
+    - fi-rdmabw-xe: Add option to set batch size
+
 -------------------------------------------------------------------
 Thu May  4 13:27:21 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/libfabric.spec b/libfabric.spec
index 4a78156..511da31 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -17,10 +17,10 @@
 
 
 #
-%define git_ver .0.8f3a881e08f5
+%define git_ver .0.a2585866c48f
 
 Name:           libfabric
-Version:        1.18.0
+Version:        1.18.1
 Release:        0
 Summary:        User-space RDMA Fabric Interfaces
 License:        BSD-2-Clause OR GPL-2.0-only