diff --git a/.gitignore b/.gitignore
index 2610b6a..70dc356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /rdma-core-33.0.tar.gz
 /rdma-core-34.0.tar.gz
 /rdma-core-35.0.tar.gz
+/rdma-core-36.0.tar.gz
diff --git a/rdma-core.spec b/rdma-core.spec
index ffcde17..520cdaa 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
-Version: 35.0
-Release: 2%{?dist}
+Version: 36.0
+Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -658,6 +658,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 14 2021 Honggang Li <honli@redhat.com> - 36.0-1
+- Rebase to upstream release v36.0
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 35.0-2
 - Rebuilt for Python 3.10
 
diff --git a/sources b/sources
index f7a74a3..5627814 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rdma-core-35.0.tar.gz) = 8a3312da45b1b94d263582640f8df79947d1ad298de0b68e1309d3c4b4b46c4f572f44c4aaeee92a7b399d6a12f23d54ce6fc643a80458d0547c2d9716b153c1
+SHA512 (rdma-core-36.0.tar.gz) = 98c742d24f28457d6cac478cdab3bbde8232008e856cdef5bf36d9089b96ca289582b1ec8772d4166c024376061dc74d240b18d9f5533f43df9e23db0549a0e5