diff --git a/rdma-core.spec b/rdma-core.spec
index ab55d35..e8bfebf 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 33.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -11,6 +11,7 @@ License: GPLv2 or BSD
 Url: https://github.com/linux-rdma/rdma-core
 Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Patch1: 0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch
+Patch2: udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
 # Do not build static libs by default.
 %define with_static %{?_with_static: 1} %{?!_with_static: 0}
 
@@ -263,7 +264,13 @@ easy, object-oriented access to IB verbs.
 %endif
 
 %prep
-%autosetup -v -p1
+%setup -q
+%if 0%{?fedora}
+%patch1 -p1
+%endif
+%if 0%{?rhel}
+%patch2 -p1
+%endif
 
 %build
 
@@ -646,6 +653,12 @@ fi
 %endif
 
 %changelog
+* Mon Feb 01 2021 Honggang Li <honli@redhat.com> - 33.0-5
+- Disable HCA rename for ELN
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jan 25 2021 Honggang Li <honli@redhat.com> - 33.0-3
 - Fix ELN build issue
 
diff --git a/udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch b/udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
new file mode 100644
index 0000000..7eeb5ab
--- /dev/null
+++ b/udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
@@ -0,0 +1,24 @@
+From fd9b3596cb1a21e54ffb102392178b6bd5d14c78 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 21 Aug 2019 17:09:13 -0400
+Subject: [PATCH rdma-core] udev: keep NAME_KERNEL as default interface
+ naming convention
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ kernel-boot/rdma-persistent-naming.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
+index 9b61e163..a561746b 100644
+--- a/kernel-boot/rdma-persistent-naming.rules
++++ b/kernel-boot/rdma-persistent-naming.rules
+@@ -25,4 +25,4 @@
+ #   Device type = RoCE
+ #   mlx5_0 -> rocex525400c0fe123455
+ #
+-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
++ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_KERNEL"
+-- 
+2.20.1
+