diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 7617b6b19b4..2307f4cd986 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -11,9 +11,12 @@ license="Boost Software License 1.0"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2"
 checksum=047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d
 
+subpackages="boost-build boost-devel"
+
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX boost-jam and boost-python subpkgs.
 	makedepends+=" python-devel"
+	subpackages+=" boost-jam boost-python"
 fi
 
 do_build() {
@@ -61,8 +64,6 @@ do_install() {
 	vinstall LICENSE_1_0.txt 644 usr/share/licenses/boost
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
 boost-jam_package() {
 	short_desc+=" - Boost.Jam utility"
 	depends="boost-build-${version}_${revision}"
@@ -70,7 +71,6 @@ boost-jam_package() {
 		vmove usr/bin/bjam
 	}
 }
-
 boost-python_package() {
 	depends="boost-${version}_${revision} python"
 	short_desc+=" - python bindings"
@@ -78,9 +78,6 @@ boost-python_package() {
 		vmove "usr/lib/libboost_python*"
 	}
 }
-
-fi # !CROSS_BUILD
-
 boost-build_package() {
 	noarch=yes
 	conf_files="/etc/site-config.jam"
@@ -90,7 +87,6 @@ boost-build_package() {
 		vmove etc
 	}
 }
-
 boost-devel_package() {
 	noverifyrdeps=yes
 	depends="boost-${version}_${revision}"