diff --git a/.gitignore b/.gitignore
index 141e995..15d85ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/opa-fm-10.10.3.0.11.tar.xz
+SOURCES/opa-fm-10.11.0.2.1.tar.xz
diff --git a/.opa-fm.metadata b/.opa-fm.metadata
index 6e677af..dcdf209 100644
--- a/.opa-fm.metadata
+++ b/.opa-fm.metadata
@@ -1 +1 @@
-ec0b4e6686543d6c841e3dbedca6e73d82867675 SOURCES/opa-fm-10.10.3.0.11.tar.xz
+5da4d907c7954a14731125cff633ad8cdd2f0b09 SOURCES/opa-fm-10.11.0.2.1.tar.xz
diff --git a/SPECS/opa-fm.spec b/SPECS/opa-fm.spec
index 25bf5b1..ca52dfe 100644
--- a/SPECS/opa-fm.spec
+++ b/SPECS/opa-fm.spec
@@ -1,17 +1,17 @@
 Name: opa-fm
 Epoch: 1
-Version: 10.10.3.0.11
+Version: 10.11.0.2.1
 Release: 1%{?dist}
 Summary: Intel Omni-Path Fabric Management Software
 
 Group: System Environment/Daemons
 License: GPLv2 or BSD
-Url: https://github.com/intel/opa-fm
+Url: https://github.com/cornelisnetworks/opa-fm.git
 # tarball created by:
-# git clone https://github.com/intel/opa-fm.git
+# git clone https://github.com/cornelisnetworks/opa-fm.git
 # cd opa-fm
 # git archive --format=tar --prefix=opa-fm-%{version}/ \
-# dd537b7574106838ad3957725d55717267b75767 | xz > opa-fm-%{version}.tar.xz
+# 5d1f7ee32920b1b429e2f7699762514af47d9717 | xz > opa-fm-%{version}.tar.xz
 Source0: %{name}-%{version}.tar.xz
 
 # bz1262327 needs Patch0002
@@ -85,6 +85,10 @@ chmod a-x %{buildroot}/%{_prefix}/share/opa-fm/opafm_src.xml
 %{_mandir}/man8/*
 
 %changelog
+* Tue May 25 2021 Honggang Li <honli@redhat.com> - 10.11.0.2.1-1
+- Rebase to upstream release 10.11.0.2.1
+- Resolves: bz1921701, bz1959990
+
 * Thu Nov 12 2020 Honggang Li <honli@redhat.com> - 10.10.3.0.11-1
 - Rebase to upstream release 10.10.3.0.11
 - Resolves: bz1821735