diff --git a/.gitignore b/.gitignore
index 855fe5c..0027dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libpsm2-10.3.8.tar.gz
+SOURCES/libpsm2-10.3.58.tar.gz
diff --git a/.libpsm2.metadata b/.libpsm2.metadata
index da95b5c..7ba9875 100644
--- a/.libpsm2.metadata
+++ b/.libpsm2.metadata
@@ -1 +1 @@
-80bd131d6a37208760196cb2eb378fa6d5a3cc4f SOURCES/libpsm2-10.3.8.tar.gz
+d02fc82b9a43f83b5d58dd423ba3354564e867b8 SOURCES/libpsm2-10.3.58.tar.gz
diff --git a/SOURCES/extend-fdesc-array.patch b/SOURCES/extend-fdesc-array.patch
new file mode 100644
index 0000000..ce358c4
--- /dev/null
+++ b/SOURCES/extend-fdesc-array.patch
@@ -0,0 +1,11 @@
+--- psm_utils.c.org	2018-06-20 22:17:32.049890400 +0800
++++ psm_utils.c	2018-06-20 22:20:10.596936992 +0800
+@@ -945,7 +945,7 @@ struct psmi_faultinj_spec *psmi_faultinj
+ 		union psmi_envvar_val env_fi;
+ 		char fvals_str[128];
+ 		char fname[128];
+-		char fdesc[256];
++		char fdesc[512];
+ 
+ 		snprintf(fvals_str, sizeof(fvals_str) - 1, "%d:%d:1", num,
+ 			 denom);
diff --git a/SPECS/libpsm2.spec b/SPECS/libpsm2.spec
index 726a3fe..61f6577 100644
--- a/SPECS/libpsm2.spec
+++ b/SPECS/libpsm2.spec
@@ -1,15 +1,16 @@
 Summary: Intel PSM Libraries
 Name: libpsm2
-Version: 10.3.8
-Release: 3%{?dist}
+Version: 10.3.58
+Release: 1%{?dist}
 License: GPLv2 or BSD
 URL: https://github.com/01org/opa-psm2
 # Source tarball obtained by:
 # git clone https://github.com/01org/opa-psm2
 # cd opa-psm2
-# # Latest commit id is a96419140a6942a11a1438bbffc4c27475d61030.
+# # Latest commit id is 0f9213e7af8d32c291d4657ff4a3279918de1e60.
 # make dist
 Source0: %{name}-%{version}.tar.gz
+Patch1: extend-fdesc-array.patch
 BuildRequires: kernel-headers >= 3.10.0-455
 BuildRequires: gcc
 BuildRequires: libuuid-devel
@@ -52,12 +53,14 @@ LD_LIBRARY_PATH=%{_libdir}/psm2-compat
 %prep
 %setup -q
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
+%patch1
 
 %build
 CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
 %make_install
+rm -f %{buildroot}%{_libdir}/*.a
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -84,6 +87,10 @@ CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 
 %changelog
+* Wed Jun 20 2018 Honggang Li <honli@redhat.com> - 10.3.58-1
+- Rebase to latest upstream release PSM2_10.3.58
+- Resolves: bz1483573
+
 * Tue Jan  9 2018 Honggang Li <honli@redhat.com> - 10.3.8-3
 - libpsm2-compat: Filter libpsm_infinipath.so.1 as private library
 - Resolves: bz1396213