diff --git a/common/shlibs b/common/shlibs
index 842703e9f1e..86f2012d582 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -563,27 +563,27 @@ libnm-util.so.2 libnm-0.9.1.90_1
 libnm-glib.so.4 libnm-0.9.1.90_1
 libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libpanel-applet-4.so.0 gnome-panel-3.3.92_1
-libboost_date_time.so.1.50.0 boost-1.50<1.51_1
-libboost_math_tr1f.so.1.50.0 boost-1.50<1.51_1
-libboost_serialization.so.1.50.0 boost-1.50<1.51_1
-libboost_filesystem.so.1.50.0 boost-1.50<1.51_1
-libboost_math_tr1l.so.1.50.0 boost-1.50<1.51_1
-libboost_signals.so.1.50.0 boost-1.50<1.51_1
-libboost_graph.so.1.50.0 boost-1.50<1.51_1
-libboost_math_tr1.so.1.50.0 boost-1.50<1.51_1
-libboost_system.so.1.50.0 boost-1.50<1.51_1
-libboost_iostreams.so.1.50.0 boost-1.50<1.51_1
-libboost_prg_exec_monitor.so.1.50.0 boost-1.50<1.51_1
-libboost_thread.so.1.50.0 boost-1.50<1.51_1
-libboost_math_c99f.so.1.50.0 boost-1.50<1.51_1
-libboost_program_options.so.1.50.0 boost-1.50<1.51_1
-libboost_unit_test_framework.so.1.50.0 boost-1.50<1.51_1
-libboost_math_c99l.so.1.50.0 boost-1.50<1.51_1
-libboost_python.so.1.50.0 boost-python-1.44<1.51_1
-libboost_wave.so.1.50.0 boost-1.50<1.51_1
-libboost_math_c99.so.1.50.0 boost-1.50<1.51_1
-libboost_regex.so.1.50.0 boost-1.50<1.51_1
-libboost_wserialization.so.1.50.0 boost-1.50<1.51_1
+libboost_date_time.so.1.53.0 boost-1.53<1.54_1
+libboost_math_tr1f.so.1.53.0 boost-1.53<1.54_1
+libboost_serialization.so.1.53.0 boost-1.53<1.54_1
+libboost_filesystem.so.1.53.0 boost-1.53<1.54_1
+libboost_math_tr1l.so.1.53.0 boost-1.53<1.54_1
+libboost_signals.so.1.53.0 boost-1.53<1.54_1
+libboost_graph.so.1.53.0 boost-1.53<1.54_1
+libboost_math_tr1.so.1.53.0 boost-1.53<1.54_1
+libboost_system.so.1.53.0 boost-1.53<1.54_1
+libboost_iostreams.so.1.53.0 boost-1.53<1.54_1
+libboost_prg_exec_monitor.so.1.53.0 boost-1.53<1.54_1
+libboost_thread.so.1.53.0 boost-1.53<1.54_1
+libboost_math_c99f.so.1.53.0 boost-1.53<1.54_1
+libboost_program_options.so.1.53.0 boost-1.53<1.54_1
+libboost_unit_test_framework.so.1.53.0 boost-1.53<1.54_1
+libboost_math_c99l.so.1.53.0 boost-1.53<1.54_1
+libboost_python.so.1.53.0 boost-python-1.44<1.51_1
+libboost_wave.so.1.53.0 boost-1.53<1.54_1
+libboost_math_c99.so.1.53.0 boost-1.53<1.54_1
+libboost_regex.so.1.53.0 boost-1.53<1.54_1
+libboost_wserialization.so.1.53.0 boost-1.53<1.54_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/template b/srcpkgs/boost/template
index 2e2391042b7..ceafd923ace 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,36 +1,41 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.50.0
-revision=2
+version=1.53.0
+revision=1
 _boostver="$(echo $version|sed 's|\.|_|g')"
 wrksrc="${pkgname}_${_boostver}"
-makedepends="zlib-devel icu-devel>=49.1 python-devel"
+makedepends="zlib-devel bzip2-devel icu-devel>=49.1"
 short_desc="Free peer-reviewed portable C++ source libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.boost.org/"
 license="Boost Software License 1.0"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2"
-checksum=c9ace2b8c81fa6703d1d17c7e478de3bc51101c5adbdeb3f6cb72cf3045a8529
+checksum=f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196
 long_desc="
  The Boost web site provides free peer-reviewed portable C++ source libraries.
  The emphasis is on libraries which work well with the C++ Standard Library.
  The libraries are intended to be widely useful, and are in regular use by
  thousands of programmers across a broad spectrum of applications."
 
-disable_debug=yes
-
-if [ "$CROSS_BUILD" ]; then
+if [ -z "$CROSS_BUILD" ]; then
 	# XXX boost-jam and boost-python subpkgs.
-	makedepends="zlib-devel icu-devel>=49.1"
+	makedepends+=" python-devel"
 fi
 
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
-		echo "using gcc : arm : ${XBPS_CROSS_TRIPLET}-g++ ;" > \
+		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
+	else
+		_toolset=gcc
+		echo "using gcc : : g++ ${CXXFLAGS} ;" > tools/build/v2/user-config.jam
 	fi
 	./bootstrap.sh -prefix=${DESTDIR}/usr
-	./bjam toolset=gcc-arm cflags="-fno-strict-aliasing $CFLAGS" ${makejobs}
+	./bjam --toolset=${_toolset} ${makejobs}
 }
 
 do_install() {
@@ -65,15 +70,15 @@ do_install() {
 if [ -z "$CROSS_BUILD" ]; then
 
 boost-jam_package() {
-	short_desc="${short_desc} - Boost.Jam utility"
+	short_desc+=" - Boost.Jam utility"
 	pkg_install() {
 		vmove usr/bin/bjam
 	}
 }
 
 boost-python_package() {
-	depends="boost>=${version} python"
-	short_desc="${short_desc} - python bindings"
+	depends="boost-${version}_${revision} python"
+	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove "usr/lib/libboost_python*"
 	}
@@ -85,7 +90,7 @@ boost-build_package() {
 	noarch=yes
 	conf_files="/etc/site-config.jam"
 	depends="boost-jam>=$version boost-devel>=$version"
-	short_desc="${short_desc} - Boost.Build framework"
+	short_desc+=" - Boost.Build framework"
 	pkg_install() {
 		vmove usr/share/boost-build
 		vmove etc
@@ -94,10 +99,11 @@ boost-build_package() {
 
 boost-devel_package() {
 	depends="boost-${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }