diff --git a/boost.spec b/boost.spec
index 7dd99cd..e7db458 100644
--- a/boost.spec
+++ b/boost.spec
@@ -23,6 +23,7 @@
 %define lib_appendix %_ver
 %define docs_version 1.56.0
 %define short_version 1_56
+%define python3X python38
 %define pname boost
 %bcond_with    build_docs
 %bcond_without package_pdf
@@ -53,12 +54,8 @@ ExclusiveArch:  do_not_build
 %define build_base 0
 %define name_suffix -extra
 %bcond_without python3
-%ifarch ia64 hppa
-%bcond_with mpi
-%else
 %bcond_without mpi
 %endif
-%endif
 
 %if "@BUILD_FLAVOR@" == "gnu-hpc"
 %define build_base 1
@@ -84,7 +81,7 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le
 %if %{with ringdisabled}
 ExclusiveArch:  do-not-build
 %else
-ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le
 %endif
 %endif
 
@@ -101,7 +98,7 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
 %if %{with ringdisabled}
 ExclusiveArch:  do-not-build
 %else
-ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le
 %endif
 %endif
 
@@ -117,7 +114,7 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
 %if %{with ringdisabled}
 ExclusiveArch:  do-not-build
 %else
-ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le
 %endif
 %endif
 
@@ -133,7 +130,7 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
 %if %{with ringdisabled}
 ExclusiveArch:  do-not-build
 %else
-ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le
 %endif
 %endif
 
@@ -738,16 +735,16 @@ Group:          Development/Libraries/C and C++
 %description -n libboost_nowide%{library_version}-devel
 Development headers for Boost.Nowide* boost libraries.
 
-%package     -n libboost_mpi_python-py3-%{library_version}
+%package     -n libboost_mpi_%{python3X}-py3-%{library_version}
 Summary:        Boost.MPI Python 3.x serialization library
 Group:          System/Libraries
 Requires:       boost-license%{library_version}
 
-%description -n libboost_mpi_python-py3-%{library_version}
+%description -n libboost_mpi_%{python3X}-py3-%{library_version}
 This package contains the Boost.MPI Python 3.x serialization
 inteface.
 
-%package     -n libboost_mpi_python-py3-%{library_version}-devel
+%package     -n libboost_mpi_%{python3X}-py3-%{library_version}-devel
 Summary:        Development library for Boost.MPI Python 3.x serialization
 Group:          Development/Libraries/C and C++
 Requires:       libboost_mpi%{library_version}-devel = %{version}
@@ -757,7 +754,7 @@ Conflicts:      boost-devel < 1.63
 Conflicts:      libboost_mpi_python3-devel-impl
 Provides:       libboost_mpi_python3-devel-impl = %{version}
 
-%description -n libboost_mpi_python-py3-%{library_version}-devel
+%description -n libboost_mpi_%{python3X}-py3-%{library_version}-devel
 This package contains the Boost.MPI development library for Python 3.x
 serialization interface
 
@@ -1211,22 +1208,6 @@ EOF
 
 %if ! %{build_base}
 
-# Build boost base PYTHON and MPI, installed in python staging
-cp user-config.jam user-config-py.jam
-cat << EOF >> user-config-py.jam
-using python
-     : %{py_ver}
-     : %{_bindir}/python3
-     : %{_includedir}/python%{py3_ver}
-     : %{_libdir}/python%{py3_ver}
-     :
-     :
-     ;
-%if %{with mpi}
-using mpi ;
-%endif
-EOF
-
 # Build boost python3 and MPI, installed in python3 staging
 %if %{with python3}
 cp user-config.jam user-config-py3.jam
@@ -1254,7 +1235,7 @@ EOF
     --python-buildid=py3 \
     --stagedir=./python3-stage %{?_smp_mflags} \
     $PY_LIBRARIES_FLAGS \
-    threading=multi link=shared runtime-link=shared stage
+    python=%{python3_version} threading=multi link=shared runtime-link=shared stage
 %endif
 
 %if %{with build_docs}
@@ -1361,6 +1342,8 @@ mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/
 install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/
 install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel
 install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost
+mv %{buildroot}%{_libdir}/boost-python3.8/mpi.%{py3_soflags}.so %{buildroot}%{package_python3_sitearch}/mpi.%{py3_soflags}.so
+rmdir %{buildroot}%{_libdir}/boost-python3.8
 %endif
 
 %if ! %{with hpc}
@@ -1421,7 +1404,6 @@ rm %{buildroot}%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake
 rm -r %{buildroot}%{package_libdir}/cmake/Boost-%{version}
 rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version}
 rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version}
-rm -r %{buildroot}%{package_libdir}/cmake/mpi-%{version}
 
 rm -rf %{buildroot}%{package_libdir}/libboost_numpy.so{,.%{version}}
 rm -rf %{buildroot}%{package_libdir}/libboost_mpi_python.so.%{version}
@@ -1513,7 +1495,7 @@ EOF
 %post -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
 
 %if %{with python3}
-%post -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
+%post -n libboost_mpi_%{python3X}-py3-%{library_version} -p /sbin/ldconfig
 %endif
 %endif
 
@@ -1563,7 +1545,7 @@ EOF
 %postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
 
 %if %{with python3}
-%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
+%postun -n libboost_mpi_%{python3X}-py3-%{library_version} -p /sbin/ldconfig
 %endif
 %endif
 
@@ -1759,7 +1741,7 @@ EOF
 
 %if %{with mpi}
 %files -n libboost_mpi%{library_version}
-%{package_libdir}/libboost_mpi.so.%{version}
+%{package_libdir}/libboost_mpi.so.1*
 
 %files -n libboost_mpi%{library_version}-devel
 %dir %{package_libdir}/cmake
@@ -1768,7 +1750,7 @@ EOF
 %{package_libdir}/libboost_mpi.so
 
 %files -n libboost_graph_parallel%{library_version}
-%{package_libdir}/libboost_graph_parallel.so.%{version}
+%{package_libdir}/libboost_graph_parallel.so.1*
 
 %files -n libboost_graph_parallel%{library_version}-devel
 %dir %{package_libdir}/cmake
@@ -1777,14 +1759,14 @@ EOF
 %{package_libdir}/libboost_graph_parallel.so
 
 %if %{with python3}
-%files -n libboost_mpi_python-py3-%{library_version}
-%{package_libdir}/libboost_mpi_python-py3.so.%{version}
+%files -n libboost_mpi_%{python3X}-py3-%{library_version}
+%{package_libdir}/libboost_mpi_%{python3X}-py3.so.%{version}
 
-%files -n libboost_mpi_python-py3-%{library_version}-devel
+%files -n libboost_mpi_%{python3X}-py3-%{library_version}-devel
 %dir %{package_libdir}/cmake/boost_mpi_python-%{version}
 %{package_libdir}/cmake/boost_mpi_python-%{version}/*
 %endif
-%{package_libdir}/libboost_mpi_python-py3.so
+%{package_libdir}/libboost_mpi_%{python3X}-py3.so
 
 %files -n python3-boost_parallel_mpi%{library_version}
 %dir %{package_python3_sitearch}/boost
@@ -1793,12 +1775,12 @@ EOF
 %{package_python3_sitearch}/boost/__init__.py
 %{package_python3_sitearch}/boost/parallel/__init__.py
 %{package_python3_sitearch}/boost/parallel/mpi/__init__.py
-%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so
+%{package_python3_sitearch}/mpi.%{py3_soflags}.so
 %endif
 
 %if %{with python3}
 %files -n libboost_python-py3-%{library_version}
-%{package_libdir}/libboost_python-py3.so.%{version}
+%{package_libdir}/libboost_python-py3.so.1*
 
 %files -n libboost_python-py3-%{library_version}-devel
 %dir %{package_libdir}/cmake
@@ -1809,7 +1791,7 @@ EOF
 
 %if %{with python_numpy}
 %files -n libboost_numpy-py3-%{library_version}
-%{package_libdir}/libboost_numpy-py3.so.%{version}
+%{package_libdir}/libboost_numpy-py3.so.1*
 
 %files -n libboost_numpy-py3-%{library_version}-devel
 %dir %{package_libdir}/cmake