diff --git a/slurm.changes b/slurm.changes
index 09eaf64..cf0e1e3 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com
 
-- Package so-versioned libs separately. sibslurm is expected
+- Package so-versioned libs separately. libslurm is expected
   to change more frequently and thus is packaged separately
   from libpmi.
 
diff --git a/slurm.spec b/slurm.spec
index 6d4fbfb..f84a727 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -147,12 +147,12 @@ This package contains the library needed to run programs dynamically linked
 with SLURM.
 
 
-%package -n libpmi-%{name}%{pmi_so}
+%package -n libpmi%{pmi_so}
 Summary:        Libraries for SLURM
 Group:          System/Libraries
 Requires:       %{libslurm} = %version
 
-%description -n libpmi-%{name}%{pmi_so}
+%description -n libpmi%{pmi_so}
 This package contains the library needed to run programs dynamically linked
 with SLURM.
 
@@ -161,7 +161,7 @@ with SLURM.
 Summary:        Development package for SLURM
 Group:          Development/Libraries/C and C++ 
 Requires:       %{libslurm} = %{version}
-Requires:       libpmi-%{name}%{pmi_so} = %{version}
+Requires:       libpmi%{pmi_so} = %{version}
 Requires:       slurm = %{version}
 
 %description devel
@@ -500,8 +500,8 @@ exit 0
 %post -n %{libslurm} -p /sbin/ldconfig
 %postun -n %{libslurm} -p /sbin/ldconfig
 
-%post -n  libpmi-%{name}%{pmi_so} -p /sbin/ldconfig
-%postun -n  libpmi-%{name}%{pmi_so} -p /sbin/ldconfig
+%post -n  libpmi%{pmi_so} -p /sbin/ldconfig
+%postun -n  libpmi%{pmi_so} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -609,11 +609,11 @@ exit 0
 
 %files -n %{libslurm}
 %defattr(-,root,root)
-%{_libdir}/*.so.%{so_version}*
+%{_libdir}/libslurm*.so.%{so_version}*
 
-%files -n libpmi-%{name}%{pmi_so}
+%files -n libpmi%{pmi_so}
 %defattr(-,root,root)
-%{_libdir}/*.so.0*
+%{_libdir}/libpmi*.so.%{pmi_so}*
 
 %files devel
 %defattr(-,root,root)