diff --git a/build/boost/doc/Jamfile.jam b/build/boost/doc/Jamfile.jam
index f407aed..bf5b54d 100644
--- a/build/boost/doc/Jamfile.jam
+++ b/build/boost/doc/Jamfile.jam
@@ -39,10 +39,9 @@ boostbook standalone
     <xsl:param>nav.layout=horizontal
 ;
 
-# not needed anymore once in boost
 project example
   : requirements
-   <include>../../../../..
+   <include>../include
 ;
 
 rule compile-examples
diff --git a/build/boost/test/Jamfile.jam b/build/boost/test/Jamfile.jam
index 16b16bf..79e96fd 100644
--- a/build/boost/test/Jamfile.jam
+++ b/build/boost/test/Jamfile.jam
@@ -8,7 +8,12 @@
 
 import testing ;
 
-project : requirements <define>BOOST_AUTO_TEST_MAIN <define>BOOST_ALL_NO_LIB ;
+project
+  : requirements
+   <define>BOOST_AUTO_TEST_MAIN
+   <define>BOOST_ALL_NO_LIB
+   <include>../include
+;
 
 rule run-test ( name )
 {
diff --git a/build/build.xml b/build/build.xml
index 35b9d23..5c87853 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -143,10 +143,9 @@
   </presetdef>
 
   <target name="boost.generate" description="generate boost.mock into ${boost.dir}">
-    <delete dir="${boost.dir}/boost/mock"/>
     <delete dir="${boost.dir}/libs/mock"/>
-    <copy todir="${boost.dir}/boost/mock">
-      <fileset dir="${libraries.dir}/turtle" includes="**"/>
+    <copy todir="${boost.dir}/libs/mock/include/turtle">
+      <fileset dir="${libraries.dir}/turtle"/>
     </copy>
     <copy todir="${boostbook.dir}">
       <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
@@ -168,45 +167,38 @@
   </target>
 
   <target name="boost.convert" description="convert boost.mock in ${boost.dir}">
+    <move file="${boost.dir}/libs/mock/include/turtle" tofile="${boost.dir}/libs/mock/include/boost/mock"/>
     <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp" excludes="**/detail/*.hpp"/>
+      <fileset dir="${boost.dir}/libs/mock/include" includes="**/*.hpp" excludes="**/detail/*.hpp"/>
     </replaceregexp>
     <replaceregexp match='"\.\./([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
+      <fileset dir="${boost.dir}/libs/mock/include" includes="**/*.hpp"/>
     </replaceregexp>
     <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/detail/\1&gt;" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/detail/*.hpp"/>
+      <fileset dir="${boost.dir}/libs/mock/include" includes="**/detail/*.hpp"/>
     </replaceregexp>
     <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match="} // mock" replace="}${line.separator}}" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/>
     </replaceregexp>
     <replaceregexp match=" mock::" replace=" boost::mock::" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match="^mock::" replace="boost::mock::" flags="m">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>
     <replaceregexp match="http://turtle.sourceforge.net" replace="Boost.Mock" flags="g">
-      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
       <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/>
     </replaceregexp>
     <replaceregexp match="reference.helpers." replace="reference.helpers.boost_" flags="g">
@@ -238,15 +230,18 @@
 
   <target name="boost.package" description="package boost.mock">
     <zip destfile="${out.dir}/boost-mock.zip">
-      <fileset dir="${boost.dir}" includes="boost/mock/**"/>
       <fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
-      <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt,Jamroot.jam,Jamfile.v2"/>
+      <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
     </zip>
+    <tar destfile="${out.dir}/boost-mock.tar.bz2" compression="bzip2">
+      <fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
+      <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
+    </tar>
   </target>
 
   <target name="documentation" depends="boost.generate,boost.doc" description="generate documentation"/>
 
-  <target name="boost" depends="boost.generate,boost.convert,boost.doc,boost.test" description="convert to boost with documentation and tests"/>
+  <target name="boost" depends="boost.generate,boost.convert,boost.doc,boost.test,boost.package" description="convert to boost with documentation and tests"/>
 
   <target name="release" depends="documentation,package" description="produce release packages">
     <fail unless="version" message="missing version property"/>
diff --git a/test/detail/test_is_functor.cpp b/test/detail/test_is_functor.cpp
index e5c63ff..ea357c2 100644
--- a/test/detail/test_is_functor.cpp
+++ b/test/detail/test_is_functor.cpp
@@ -12,7 +12,7 @@
 #pragma warning( push, 0 )
 #endif
 #include <boost/lambda/lambda.hpp>
-#include <boost/spirit/home/phoenix.hpp>
+#include <boost/phoenix/phoenix.hpp>
 #ifdef BOOST_MSVC
 #pragma warning( pop )
 #endif
diff --git a/test/test_log.cpp b/test/test_log.cpp
index b8b44f0..6722c44 100644
--- a/test/test_log.cpp
+++ b/test/test_log.cpp
@@ -15,8 +15,8 @@
 #ifdef BOOST_MSVC
 #pragma warning( push, 0 )
 #endif
-#include <boost/spirit/home/phoenix.hpp>
-#include <boost/spirit/home/phoenix/bind.hpp>
+#include <boost/phoenix/phoenix.hpp>
+#include <boost/phoenix/bind.hpp>
 #ifndef BOOST_MSVC // this produces an ICE with all versions of MSVC
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
diff --git a/turtle/config.hpp b/turtle/config.hpp
index 36b90f8..b1262b2 100644
--- a/turtle/config.hpp
+++ b/turtle/config.hpp
@@ -22,6 +22,7 @@
 #   define MOCK_MAX_ARGS 9
 #elif BOOST_PP_LESS(9, MOCK_MAX_ARGS)
 #   define MOCK_USE_BOOST_PHOENIX
+#   define BOOST_PHOENIX_USE_V2_OVER_V3
 #endif
 
 #ifndef MOCK_MAX_SEQUENCES
diff --git a/turtle/detail/lambda.hpp b/turtle/detail/lambda.hpp
index e805ab6..4ee35d7 100644
--- a/turtle/detail/lambda.hpp
+++ b/turtle/detail/lambda.hpp
@@ -11,7 +11,7 @@
 
 #include "../config.hpp"
 #ifdef MOCK_USE_BOOST_PHOENIX
-#include <boost/spirit/home/phoenix/bind.hpp>
+#include <boost/phoenix/bind.hpp>
 #else
 #include <boost/bind.hpp>
 #endif