diff --git a/MPI/boost/build b/MPI/boost/build
index 67f0081..8e7053c 100755
--- a/MPI/boost/build
+++ b/MPI/boost/build
@@ -4,41 +4,48 @@ pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/boost/bo
 
 pbuild::add_to_group 'MPI'
 
+pbuild::add_patch "files/context-Jamfile.patch"
+
 BOOST_BUILD_PATH="${BUILD_DIR}"
 
+declare -x TOOLSET=''
+
+pbuild::pre_configure() {
+	case "${COMPILER}" in
+	gcc )
+	        TOOLSET=gcc
+	        ;;
+	* )
+	        std::die 1 "Unsupported compiler!"
+	        ;;
+	esac
+}
+
 pbuild::configure() {
-	cd "${SRC_DIR}"
-	"${SRC_DIR}"/bootstrap.sh \
-		--prefix="${PREFIX}" \
-		--with-libraries=all \
-		--with-python-root="${PYTHON_PREFIX}" \
-		|| exit 1
-	echo "using mpi ;" >> "${SRC_DIR}/project-config.jam"
+        cd "${SRC_DIR}"
+        ./bootstrap.sh \
+                --prefix="${PREFIX}" \
+                --with-toolset=${TOOLSET} \
+                --without-libraries=python \
+                || exit 1
+        echo "using mpi ;" >> "./project-config.jam"
 }
 
 pbuild::compile() {
-	cd "${SRC_DIR}"
-	./b2 \
-		--build-type=minimal \
-		--build-dir="${BUILD_DIR}" \
-		--layout=system \
-		variant=release \
-		link=shared,static \
-		threading=multi \
-		stage
+        cd "${SRC_DIR}"
+        ./b2  \
+                --build-dir="${BUILD_DIR}" \
+                --layout=system \
+                --without-python \
+                toolset=${TOOLSET} \
+                variant=release \
+                link=shared,static \
+                threading=multi \
+                install -j 3 \
+                || exit 1
 }
 
 pbuild::install() {
-	cd "${SRC_DIR}"
-	./b2 \
-		--build-type=minimal \
-		--build-dir="${BUILD_DIR}" \
-		--layout=system \
-		variant=release \
-		link=shared,static \
-		threading=multi \
-		install
+        :
 }
 
-pbuild::make_all
-
diff --git a/MPI/boost/files/context-Jamfile.patch b/MPI/boost/files/context-Jamfile.patch
new file mode 100644
index 0000000..1acd6b7
--- /dev/null
+++ b/MPI/boost/files/context-Jamfile.patch
@@ -0,0 +1,20 @@
+--- src.orig/libs/context/build/Jamfile.v2	2018-08-01 22:50:46.000000000 +0200
++++ src/libs/context/build/Jamfile.v2	2018-11-30 10:06:57.000000000 +0100
+@@ -613,6 +613,17 @@
+      <address-model>64
+      <architecture>x86
+      <binary-format>mach-o
++     <toolset>gcc
++   ;
++
++alias asm_sources
++   : asm/make_x86_64_sysv_macho_gas.S
++     asm/jump_x86_64_sysv_macho_gas.S
++     asm/ontop_x86_64_sysv_macho_gas.S
++   : <abi>sysv
++     <address-model>64
++     <architecture>x86
++     <binary-format>mach-o
+      <toolset>darwin
+    ;
+