diff --git a/openmpi4.changes b/openmpi4.changes
index 4c55645..1e9ddbb 100644
--- a/openmpi4.changes
+++ b/openmpi4.changes
@@ -2,6 +2,8 @@
 Wed Apr 28 11:08:54 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
 - openmpi4 is now the default openmpi for releases > 15.3
+- Add orted-mpir-add-version-to-shared-library.patch to fix unversionned library
+- Change RPM macros install path to %{_rpmmacrodir}
 
 -------------------------------------------------------------------
 Wed Apr 28 09:24:33 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
diff --git a/openmpi4.spec b/openmpi4.spec
index 724bb48..f201e0c 100644
--- a/openmpi4.spec
+++ b/openmpi4.spec
@@ -139,6 +139,7 @@ Source2:        openmpi4-rpmlintrc
 Source3:        macros.hpc-openmpi
 Source4:        mpivars.sh
 Source5:        mpivars.csh
+Patch1:         orted-mpir-add-version-to-shared-library.patch
 Provides:       mpi
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -397,6 +398,7 @@ echo with HPC
 echo without HPC
 %endif
 %setup -q -n  openmpi-%{version}%{git_ver}
+%patch1
 
 %if %{without hpc}
 cat > %{_sourcedir}/baselibs.conf  <<EOF
@@ -537,8 +539,8 @@ prepend-path LD_LIBRARY_PATH %{mpi_libdir}
 
 EOF
 
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cat <<EOF >%{buildroot}%{_sysconfdir}/rpm/macros.openmpi
+mkdir -p %{buildroot}%{_rpmmacrodir}
+cat <<EOF >%{buildroot}%{_rpmmacrodir}/macros.openmpi
 #
 # openmpi
 #
@@ -584,9 +586,9 @@ EOF
 sed -e "s/export/setenv/" -e "s/=/ /" \
     %{buildroot}/%{mpi_bindir}/mpivars.sh > \
     %{buildroot}/%{mpi_bindir}/mpivars.csh
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
+mkdir -p %{buildroot}%{_rpmmacrodir}
+mkdir -p %{buildroot}%{_rpmmacrodir}
+cp %{S:3} %{buildroot}%{_rpmmacrodir}
 
 # Drop the files that should go into %{pname}-config as we only package them
 # in the non HPC build
@@ -734,9 +736,9 @@ fi
 %files macros-devel
 %defattr(-,root,root,-)
 %if %{with hpc}
-%config %{_sysconfdir}/rpm/macros.hpc-openmpi
+%{_rpmmacrodir}/macros.hpc-openmpi
 %else
-%config %{_sysconfdir}/rpm/macros.openmpi
+%{_rpmmacrodir}/macros.openmpi
 %endif
 
 %if 0%{?build_static_devel}
diff --git a/orted-mpir-add-version-to-shared-library.patch b/orted-mpir-add-version-to-shared-library.patch
new file mode 100644
index 0000000..52ba5cb
--- /dev/null
+++ b/orted-mpir-add-version-to-shared-library.patch
@@ -0,0 +1,22 @@
+commit bd2ceac4315c772e02cbb070e443d1acf2512da1
+Author: Andrew J. Hesford <ajh@sideband.org>
+Date:   Thu Apr 29 15:13:23 2021 -0400
+
+    orted-mpir: add version to shared library
+    
+    Because orted-mpir is installed in the public library direrctory, it
+    should have a version. Assign the library libopen_rte_so_version to be
+    consistent with the rest of the RTE.
+    
+    Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
+
+diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am
+index 5c0dd335644a..8105dd4a6b83 100644
+--- orte/orted/orted-mpir/Makefile.am
++++ orte/orted/orted-mpir/Makefile.am
+@@ -19,4 +19,4 @@ lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
+ lib@ORTE_LIB_PREFIX@open_orted_mpir_la_SOURCES = \
+         orted_mpir_breakpoint.c \
+         orted_mpir.h
+-lib@ORTE_LIB_PREFIX@open_orted_mpir_la_LDFLAGS = -avoid-version
++lib@ORTE_LIB_PREFIX@open_orted_mpir_la_LDFLAGS = -version-info $(libopen_rte_so_version)