Index: devel/boost-libs/Makefile
===================================================================
--- devel/boost-libs/Makefile	(revision 220)
+++ devel/boost-libs/Makefile	(working copy)
@@ -3,13 +3,16 @@
 
 BOOST_PACKAGE=		libs
 BOOST_COMMENT=		(binary libraries)
-BOOST_CONFIG=		installed
+BOOST_CONFIG=		none
 BOOST_INSTALL_LIBS=	yes
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/boost/Makefile.common"
 
+BJAM_ARGS+=		include=boost/compatibility/cpp_c_headers
+BJAM_ARGS+=		-sBZIP2_INCLUDE=/usr/pkg/include
+BJAM_ARGS+=		-sBZIP2_LIBPATH=/usr/pkg/lib
 BJAM_ARGS+=		--without-python
 
 .include "../../devel/boost-jam/bjam.mk"
Index: devel/boost-headers/Makefile
===================================================================
--- devel/boost-headers/Makefile	(revision 220)
+++ devel/boost-headers/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 BOOST_PACKAGE=		headers
 BOOST_COMMENT=		(build-time headers)
-BOOST_CONFIG=		generate
+BOOST_CONFIG=		none
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
Index: devel/boost-build/toolset.mk
===================================================================
--- devel/boost-build/toolset.mk	(revision 220)
+++ devel/boost-build/toolset.mk	(working copy)
@@ -4,6 +4,8 @@
 
 .if ${OPSYS} == "Darwin"
 BOOST_TOOLSET=		darwin
+.elif !empty(PKGSRC_COMPILER:Mqcc)
+BOOST_TOOLSET=		qcc
 .elif !empty(PKGSRC_COMPILER:Mgcc)
 BOOST_TOOLSET=		gcc
 .elif !empty(PKGSRC_COMPILER:Mmipspro*)