diff --git a/.gitignore b/.gitignore
index 70dc356..04c39ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /rdma-core-34.0.tar.gz
 /rdma-core-35.0.tar.gz
 /rdma-core-36.0.tar.gz
+/rdma-core-37.0.tar.gz
diff --git a/rdma-core.spec b/rdma-core.spec
index 5736c71..6665ca1 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
-Version: 36.0
-Release: 3%{?dist}
+Version: 37.0
+Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -156,10 +156,10 @@ Provides: libefa = %{version}-%{release}
 Obsoletes: libefa < %{version}-%{release}
 Provides: libhfi1 = %{version}-%{release}
 Obsoletes: libhfi1 < %{version}-%{release}
-Provides: libi40iw = %{version}-%{release}
-Obsoletes: libi40iw < %{version}-%{release}
 Provides: libipathverbs = %{version}-%{release}
 Obsoletes: libipathverbs < %{version}-%{release}
+Provides: libirdma = %{version}-%{release}
+Obsoletes: libirdma < %{version}-%{release}
 Provides: libmlx4 = %{version}-%{release}
 Obsoletes: libmlx4 < %{version}-%{release}
 Provides: libmlx5 = %{version}-%{release}
@@ -187,8 +187,8 @@ Device-specific plug-in ibverbs userspace drivers are included:
 - libefa: Amazon Elastic Fabric Adapter
 - libhfi1: Intel Omni-Path HFI
 - libhns: HiSilicon Hip06 SoC
-- libi40iw: Intel Ethernet Connection X722 RDMA
 - libipathverbs: QLogic InfiniPath HCA
+- libirdma: Intel Ethernet Connection RDMA
 - libmlx4: Mellanox ConnectX-3 InfiniBand HCA
 - libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA
 - libmthca: Mellanox InfiniBand HCA
@@ -208,6 +208,9 @@ displays information about RDMA devices.
 
 %package -n ibacm
 Summary: InfiniBand Communication Manager Assistant
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description -n ibacm
 The ibacm daemon helps reduce the load of managing path record lookups on
@@ -221,6 +224,9 @@ library knows how to talk directly to the ibacm daemon to retrieve data.
 
 %package -n iwpmd
 Summary: iWarp Port Mapper userspace daemon
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description -n iwpmd
 iwpmd provides a userspace service for iWarp drivers to claim
@@ -252,6 +258,9 @@ Summary: Tools for using the InfiniBand SRP protocol devices
 Obsoletes: srptools <= 1.0.3
 Provides: srptools = %{version}-%{release}
 Obsoletes: openib-srptools <= 0.0.6
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description -n srp_daemon
 In conjunction with the kernel ib_srp driver, srp_daemon allows you to
@@ -657,6 +666,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 22 2021 Honggang Li <honli@redhat.com> - 37.0-1
+- Rebase to upstream release v37.0
+
 * Mon Sep 06 2021 Honggang Li <honli@redhat.com> - 36.0-3
 - rdma-core-devel should not require ibacm
 - Resolves: bz2000123
diff --git a/sources b/sources
index 5627814..f61adf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rdma-core-36.0.tar.gz) = 98c742d24f28457d6cac478cdab3bbde8232008e856cdef5bf36d9089b96ca289582b1ec8772d4166c024376061dc74d240b18d9f5533f43df9e23db0549a0e5
+SHA512 (rdma-core-37.0.tar.gz) = a5774dac92f6a71949d2a62beca7be008a35a7538375b38a42c1f80c8f1df30b3c30484ca8244eeff85306d980982849002fd6c345743380770e3dedfeb0683a