diff --git a/.gitignore b/.gitignore
index fe7d30a..afbfd41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libpsm2-10.2.2.tar.gz
 /libpsm2-10.2.103_1.tar.gz
 /libpsm2-10.3.8.tar.gz
+/libpsm2-10.3.58.tar.gz
diff --git a/libpsm2.spec b/libpsm2.spec
index f71df05..31e1006 100644
--- a/libpsm2.spec
+++ b/libpsm2.spec
@@ -52,15 +52,15 @@
 #
 Summary: Intel PSM Libraries
 Name: libpsm2
-Version: 10.3.8
-Release: 5%{?dist}
+Version: 10.3.58
+Release: 1%{?dist}
 License: BSD or GPLv2
 URL: https://github.com/01org/opa-psm2/
 
 # The tarball can be created by:
 # git clone https://github.com/01org/opa-psm2
 # cd opa-psm2
-# git checkout a96419140a6942a11a1438bbffc4c27475d61030
+# git checkout 0f9213e7af8d32c291d4657ff4a3279918de1e60
 # make dist
 Source0: %{name}-%{version}.tar.gz
 Patch1:  extend-fdesc-array.patch
@@ -110,6 +110,7 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+rm -f %{buildroot}%{_libdir}/*.a
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -142,6 +143,10 @@ make %{?_smp_mflags}
 %endif
 
 %changelog
+* Fri Jun 22 2018 Honggang Li <honli@redhat.com> - 10.3.58-1
+- Rebase to latest upstream release 10.3.58.
+- Resolves: bz1594073
+
 * Thu Mar 15 2018 - 10.3.8-5
 - Fix partial injection of Fedora build flags.
 - Double the sizeof array fdesc to fix a gcc compiling issue.
diff --git a/sources b/sources
index a5b9a46..c5a390e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libpsm2-10.3.8.tar.gz) = f22587e9d93cb34bc405580064b160f9820987d3a2761eceddf87e237681d9c3082ab52d2b64c06eed012ce1fefb855fb198e9bc6becb2cc9226b86b97db3727
+SHA512 (libpsm2-10.3.58.tar.gz) = 764237a32d95b2f8a000cbd6e23325e7962712f8ffa540248f87583c11860f13adf277cf6503bf3fe470a6876546a1307eefce6034241351c77a5ec450ea65db