diff --git a/boost-toolfile.spec b/boost-toolfile.spec
index 295384edc46..771fa226ac5 100644
--- a/boost-toolfile.spec
+++ b/boost-toolfile.spec
@@ -1,4 +1,4 @@
-### RPM external boost-toolfile 1.2
+### RPM external boost-toolfile 1.3
 Requires: boost
 %prep
 
@@ -124,6 +124,16 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_iostreams.xml
 </tool>
 EOF_TOOLFILE
 
+# boost_mpi toolfile
+cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_mpi.xml
+<tool name="boost_mpi" version="@TOOL_VERSION@">
+  <info url="http://www.boost.org"/>
+  <lib name="@BOOST_MPI_LIB@"/>
+  <use name="boost"/>
+  <use name="boost_serialization"/>
+</tool>
+EOF_TOOLFILE
+
 # boost_header toolfile
 cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_header.xml
 <tool name="boost_header" version="@TOOL_VERSION@">
@@ -155,6 +165,7 @@ export BOOST_PYTHON_LIB=`getLibName python`
 export BOOST_REGEX_LIB=`getLibName regex`
 export BOOST_SERIALIZATION_LIB=`getLibName serialization`
 export BOOST_IOSTREAMS_LIB=`getLibName iostream`
+export BOOST_MPI_LIB=`getLibName mpi`
 export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
 
 ## IMPORT scram-tools-post
diff --git a/boost.spec b/boost.spec
index 2769b846ee6..efd815b0b02 100644
--- a/boost.spec
+++ b/boost.spec
@@ -5,7 +5,7 @@
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%n.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 
-Requires: python bz2lib zlib
+Requires: python bz2lib zlib openmpi
 
 %prep
 %setup -n %{n}-%{realversion}
@@ -23,6 +23,9 @@ pushd tools/build
   export PATH=${PWD}/tmp-boost-build/bin:${PATH}
 popd
 
+# enable boost::mpi
+echo "using mpi ;" > user-config.jam
+
 b2 -q \
    -d2 \
    %{makeprocesses} \
@@ -38,9 +41,9 @@ b2 -q \
    --without-locale \
    --without-log \
    --without-math \
-   --without-mpi \
    --without-random \
    --without-wave \
+   --user-config=${PWD}/user-config.jam \
    toolset=${TOOLSET} \
    link=shared \
    threading=multi \
diff --git a/openmpi-2.1.1-disable-lsf-support.patch b/openmpi-2.1.1-disable-lsf-support.patch
deleted file mode 100644
index ec2d0b218b2..00000000000
--- a/openmpi-2.1.1-disable-lsf-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/config/orte_check_lsf.m4	2017-05-10 17:40:48.000000000 +0200
-+++ b/config/orte_check_lsf.m4	2017-05-22 11:00:48.652372379 +0200
-@@ -26,7 +26,7 @@
- # ORTE_CHECK_LSF(prefix, [action-if-found], [action-if-not-found])
- # --------------------------------------------------------
- AC_DEFUN([ORTE_CHECK_LSF],[
--    if test -z "$orte_check_lsf_happy" ; then
-+    AS_IF([test -z "$orte_check_lsf_happy"],[
- 	AC_ARG_WITH([lsf],
- 		    [AC_HELP_STRING([--with-lsf(=DIR)],
- 				    [Build LSF support])])
-@@ -34,6 +34,7 @@
- 	AC_ARG_WITH([lsf-libdir],
- 		    [AC_HELP_STRING([--with-lsf-libdir=DIR],
- 				    [Search for LSF libraries in DIR])])
-+    AS_IF([test "$with_lsf" != "no"],[
- 	OPAL_CHECK_WITHDIR([lsf-libdir], [$with_lsf_libdir], [libbat.*])
- 
- 	# Defaults
-@@ -123,7 +124,8 @@
- 	LIBS="$orte_check_lsf_$1_save_LIBS"
- 
- 	OPAL_SUMMARY_ADD([[Resource Managers]],[[LSF]],[$1],[$orte_check_lsf_happy])
--    fi
-+    ],[orte_check_lsf_happy=no])
-+    ]) 
- 
-     AS_IF([test "$orte_check_lsf_happy" = "yes"],
-           [$1_LIBS="[$]$1_LIBS $orte_check_lsf_LIBS"
diff --git a/openmpi.spec b/openmpi.spec
index cb4880fc56b..cc0fc1cda3a 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -1,17 +1,16 @@
-### RPM external openmpi 2.1.2rc4
+### RPM external openmpi 2.1.5
 ## INITENV SET OPAL_PREFIX %{i}
-Source: http://www.open-mpi.org/software/ompi/v2.1/downloads/%{n}-%{realversion}.tar.gz 
-Patch1: openmpi-2.1.1-disable-lsf-support
+Source: http://download.open-mpi.org/release/open-mpi/v2.1/%{n}-%{realversion}.tar.gz
 BuildRequires: autotools
+
 %prep
 %setup -q -n %{n}-%{realversion}
-%patch1 -p1
 sed -i -e 's|#!/usr/bin/perl|#!/usr/bin/env perl|' ./opal/asm/generate-asm.pl
 sed -i -e 's|#!/usr/bin/perl|#!/usr/bin/env perl|' opal/asm/generate-all-asm.pl
 sed -i -e 's|/usr/bin/perl|/usr/bin/env perl|' ./Doxyfile
 sed -i -e 's|/usr/bin/perl|/usr/bin/env perl|' ./orte/Doxyfile
 ./autogen.pl --force
-./configure --prefix=%i --without-lsf --disable-libnuma --enable-mpi-cxx
+./configure --prefix=%i --without-lsf --disable-libnuma --enable-mpi-cxx --enable-mpi-thread-multiple
 
 %build
 make %{makeprocesses}