diff --git a/boost.spec b/boost.spec
index dc9b0b78cfcf105617b6899bd090fb216b24e610..280e95a7c3e62d304c27e9f50afc65ea83dc5690 100644
--- a/boost.spec
+++ b/boost.spec
@@ -628,11 +628,9 @@ using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{pyth
 EOF
 %endif
 
-./bootstrap.sh --with-toolset=gcc --with-icu
-
-echo ============================= build serial ==================
+./bootstrap.sh
 ./b2 -d+2 -q %{?_smp_mflags} \
-  --without-mpi --without-graph_parallel --build-dir=serial \
+ --build-dir=serial \
 %if !%{with context}
     --without-context --without-coroutine \
     --without-fiber \
@@ -651,44 +649,6 @@ fi
 
 m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} %{SOURCE1} > $(basename %{SOURCE1})
 
-%if %{with openmpi} || %{with mpich}
-module purge ||:
-%endif
-
-%if %{with openmpi}
-%{_openmpi_load}
-
-%if %{with python3}
-echo ============================= build $MPI_COMPILER ==================
-./b2 -d+2 -q %{?_smp_mflags} \
-    --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
-    variant=release threading=multi debug-symbols=on pch=off \
-    python=%{python3_version} stage
-%endif
-
-%{_openmpi_unload}
-export PATH=/bin${PATH:+:}$PATH
-%endif
-
-%if %{with mpich}
-%{_mpich_load}
-
-%if %{with python3}
-echo ============================= build $MPI_COMPILER ==================
-./b2 -d+2 -q %{?_smp_mflags} \
-    --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
-    variant=release threading=multi debug-symbols=on pch=off \
-    python=%{python3_version} stage
-%endif
-
-%{_mpich_unload}
-export PATH=/bin${PATH:+:}$PATH
-%endif
-
-echo ============================= build Boost.Build ==================
-(cd tools/build
- ./bootstrap.sh --with-toolset=gcc)
-
 %check
 :
 
@@ -774,17 +734,15 @@ rm -r $RPM_BUILD_ROOT/%{_libdir}/cmake
 version=%{version}
 
 echo ============================= install Boost.Build ==================
-(cd tools/build
- ./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
+(./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
  chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py
  sed -i '1s@^#!/usr/bin.python$@&3@' $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py
  rm $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp
  rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp
  rm -f $RPM_BUILD_ROOT%{_bindir}/b2
 
- install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
+ install -m 755 %{_builddir}/%{name}_%{version_enc}/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
  %{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
- cp %{_libdir}/libboost_*.so.%{old_so_version}.* $RPM_BUILD_ROOT%{_libdir}
 )
 
 echo ============================= install Boost.QuickBook ==================