diff --git a/common/shlibs b/common/shlibs
index b539202dbc..ee0acecca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -568,35 +568,37 @@ libnm-glib.so.4 libnm-0.9.1.90_1
 libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libpanel-applet-4.so.0 gnome-panel-3.3.92_1
-libboost_context.so.1.54.0 boost-1.54<1.55_1
-libboost_prg_exec_monitor.so.1.54.0 boost-1.54<1.55_1
-libboost_signals.so.1.54.0 boost-1.54<1.55_1
-libboost_timer.so.1.54.0 boost-1.54<1.55_1
-libboost_random.so.1.54.0 boost-1.54<1.55_1
-libboost_filesystem.so.1.54.0 boost-1.54<1.55_1
-libboost_unit_test_framework.so.1.54.0 boost-1.54<1.55_1
-libboost_math_c99f.so.1.54.0 boost-1.54<1.55_1
-libboost_math_tr1f.so.1.54.0 boost-1.54<1.55_1
-libboost_regex.so.1.54.0 boost-1.54<1.55_1
-libboost_serialization.so.1.54.0 boost-1.54<1.55_1
-libboost_chrono.so.1.54.0 boost-1.54<1.55_1
-libboost_wserialization.so.1.54.0 boost-1.54<1.55_1
-libboost_graph.so.1.54.0 boost-1.54<1.55_1
-libboost_log.so.1.54.0 boost-1.54<1.55_1
-libboost_locale.so.1.54.0 boost-1.54<1.55_1
-libboost_math_tr1l.so.1.54.0 boost-1.54<1.55_1
-libboost_program_options.so.1.54.0 boost-1.54<1.55_1
-libboost_iostreams.so.1.54.0 boost-1.54<1.55_1
-libboost_system.so.1.54.0 boost-1.54<1.55_1
-libboost_thread.so.1.54.0 boost-1.54<1.55_1
-libboost_log_setup.so.1.54.0 boost-1.54<1.55_1
-libboost_date_time.so.1.54.0 boost-1.54<1.55_1
-libboost_math_c99.so.1.54.0 boost-1.54<1.55_1
-libboost_wave.so.1.54.0 boost-1.54<1.55_1
-libboost_math_tr1.so.1.54.0 boost-1.54<1.55_1
-libboost_atomic.so.1.54.0 boost-1.54<1.55_1
-ibboost_math_c99l.so.1.54.0 boost-1.54<1.55_1
-libboost_python.so.1.54.0 boost-python-1.54<1.55_1
+libboost_context.so.1.58.0 boost-1.58<1.59_1
+libboost_coroutine.so.1.58.0 boost-1.58<1.59_1
+libboost_container.so.1.58.0 boost-1.58<1.59_1
+libboost_prg_exec_monitor.so.1.58.0 boost-1.58<1.59_1
+libboost_signals.so.1.58.0 boost-1.58<1.59_1
+libboost_timer.so.1.58.0 boost-1.58<1.59_1
+libboost_random.so.1.58.0 boost-1.58<1.59_1
+libboost_filesystem.so.1.58.0 boost-1.58<1.59_1
+libboost_unit_test_framework.so.1.58.0 boost-1.58<1.59_1
+libboost_math_c99f.so.1.58.0 boost-1.58<1.59_1
+libboost_math_tr1f.so.1.58.0 boost-1.58<1.59_1
+libboost_regex.so.1.58.0 boost-1.58<1.59_1
+libboost_serialization.so.1.58.0 boost-1.58<1.59_1
+libboost_chrono.so.1.58.0 boost-1.58<1.59_1
+libboost_wserialization.so.1.58.0 boost-1.58<1.59_1
+libboost_graph.so.1.58.0 boost-1.58<1.59_1
+libboost_log.so.1.58.0 boost-1.58<1.59_1
+libboost_locale.so.1.58.0 boost-1.58<1.59_1
+libboost_math_tr1l.so.1.58.0 boost-1.58<1.59_1
+libboost_program_options.so.1.58.0 boost-1.58<1.59_1
+libboost_iostreams.so.1.58.0 boost-1.58<1.59_1
+libboost_system.so.1.58.0 boost-1.58<1.59_1
+libboost_thread.so.1.58.0 boost-1.58<1.59_1
+libboost_log_setup.so.1.58.0 boost-1.58<1.59_1
+libboost_date_time.so.1.58.0 boost-1.58<1.59_1
+libboost_math_c99.so.1.58.0 boost-1.58<1.59_1
+libboost_wave.so.1.58.0 boost-1.58<1.59_1
+libboost_math_tr1.so.1.58.0 boost-1.58<1.59_1
+libboost_atomic.so.1.58.0 boost-1.58<1.59_1
+libboost_math_c99l.so.1.58.0 boost-1.58<1.59_1
+libboost_python.so.1.58.0 boost-python-1.58<1.59_1
 libexempi.so.3 exempi-2.1.1_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2.so.2 libsgutils-1.28_1
diff --git a/srcpkgs/boost/patches/boost-1.54.0-Fix-macro-for-int128-detection.patch b/srcpkgs/boost/patches/boost-1.54.0-Fix-macro-for-int128-detection.patch
deleted file mode 100644
index 7947dc6f10..0000000000
--- a/srcpkgs/boost/patches/boost-1.54.0-Fix-macro-for-int128-detection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- boost/lexical_cast.hpp	(revision 84136)
-+++ boost/lexical_cast.hpp	(revision 84965)
-@@ -70,8 +70,8 @@
- #endif
- 
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
--
- 
- namespace boost
---- libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 83717)
-+++ libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 84965)
-@@ -49,5 +49,5 @@
- #endif
- 
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
-@@ -445,6 +445,6 @@
- 
-     // Overflow test case from David W. Birdsall
--    std::string must_owerflow_str = "160000000000000000000";
--    std::string must_owerflow_negative_str = "-160000000000000000000";
-+    std::string must_owerflow_str =             (sizeof(T) < 16 ?  "160000000000000000000" :  "1600000000000000000000000000000000000000");
-+    std::string must_owerflow_negative_str =    (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
-     for (int i = 0; i < 15; ++i) {
-         BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
diff --git a/srcpkgs/boost/patches/fix-new-glibc.patch b/srcpkgs/boost/patches/fix-new-glibc.patch
deleted file mode 100644
index 13223473b7..0000000000
--- a/srcpkgs/boost/patches/fix-new-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- boost/cstdint.hpp	(revision 84805)
-+++ boost/cstdint.hpp	(revision 84950)
-@@ -42,5 +42,8 @@
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H)					\
-+  && (!defined(__GLIBC__)					\
-+      || defined(__GLIBC_HAVE_LONG_LONG)			\
-+      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
- 
- // The following #include is an implementation artifact; not part of interface.
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 4cffa08974..05248ab67c 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,15 +1,16 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.54.0
-revision=6
+version=1.58.0
+revision=1
 wrksrc="${pkgname}_${version//\./_}"
+hostmakedepends="bzip2-devel"
 makedepends="zlib-devel bzip2-devel icu-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.boost.org/"
 license="Boost Software License 1.0"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2"
-checksum=047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d
+checksum=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5
 
 subpackages="boost-build boost-devel"
 
@@ -19,49 +20,48 @@ if [ -z "$CROSS_BUILD" ]; then
 	subpackages+=" boost-jam boost-python"
 fi
 
+_abi=sysv
+_toolset=gcc
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm; _toolset="gcc-arm"; _abi=aapcs;;
+	aarch64*) _arch=aarch64; _toolset="gcc-aarch64"; _abi=aapcs;;
+	mips*) _arch=mips; _toolset="gcc-mips"; _abi=o32;;
+esac
+
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _arch=arm; _toolset="gcc-arm";;
-			mips*) _arch=mips; _toolset="gcc-mips";;
-		esac
-		echo "using gcc : ${_arch} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" > \
-			tools/build/v2/user-config.jam
+		echo "using gcc : ${_arch} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" > user-config.jam
 	else
-		_toolset=gcc
-		echo "using gcc : : g++ ${CXXFLAGS} ;" > tools/build/v2/user-config.jam
+		echo "using gcc : : g++ ${CXXFLAGS} ;" > user-config.jam
 	fi
 	./bootstrap.sh -prefix=${DESTDIR}/usr
-	./bjam --toolset=${_toolset} ${makejobs}
+	./bjam --toolset=${_toolset} ${makejobs} abi=$_abi \
+		--user-config=${wrksrc}/user-config.jam
 }
 
 do_install() {
 	# Install bjam
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _bindir="bin.linuxx86";;
-		x86_64*) _bindir="bin.linuxx86_64";;
-		arm*) _bindir="bin.linuxarm";;
-	esac
 	if [ -z "$CROSS_BUILD" ]; then
-		vinstall bjam 755 usr/bin
+		vbin bjam
 	fi
 
 	# Install headers/libs
-	./bjam --prefix=${DESTDIR}/usr install
+	./bjam --prefix=${DESTDIR}/usr abi=$_abi \
+		--user-config=${wrksrc}/user-config.jam install
 
 	# Install Boost.Build stuff.
 	vmkdir usr/share/boost-build
-	cd ${wrksrc}/tools/build/v2 && cp -a . ${DESTDIR}/usr/share/boost-build
+	cd ${wrksrc}/tools/build && cp -a . ${DESTDIR}/usr/share/boost-build
 	find ${DESTDIR}/usr/share/boost-build \
 		-type f -name \*.orig -exec rm -f {} \;
 	( echo '# System wide configuration file for Boost.Build.' ; \
 	  echo ; \
 	  echo 'using gcc ;' ; ) >${wrksrc}/site-config.jam
 	cd $wrksrc
-	vinstall site-config.jam 644 etc
+	vconf site-config.jam
 
 	# license
-	vinstall LICENSE_1_0.txt 644 usr/share/licenses/boost
+	vlicense LICENSE_1_0.txt
 }
 
 boost-jam_package() {