diff --git a/build/boost/doc/example/patterns_quick_constraint.cpp b/build/boost/doc/example/patterns_quick_constraint.cpp
index 7cfccc3..e07219d 100644
--- a/build/boost/doc/example/patterns_quick_constraint.cpp
+++ b/build/boost/doc/example/patterns_quick_constraint.cpp
@@ -31,16 +31,16 @@ namespace
 
 namespace mock // it could also be in the namespace of 'my_class'
 {
-    bool operator==( const my_class& actual, const std::string& expected ) // the trick is to compare to a string
+    bool operator==( const my_class& actual, const std::string& expected ) // the first part of trick is to compare to a string
     {
         return boost::lexical_cast< std::string >( actual ) == expected;
     }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( method_is_called )
 {
     my_mock mock;
-    MOCK_EXPECT( mock.method ).once().with( "my_class( 42 )" ); // the constraint is given as a string
+    MOCK_EXPECT( mock.method ).once().with( "my_class( 42 )" ); // the second part of the trick is to express the constraint as a string
     mock.method( my_class( 42 ) );
 }
 //]
diff --git a/build/build.xml b/build/build.xml
index 648ca2f..ae8f197 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -120,8 +120,15 @@
 
   <property name="boost.dir" value="${out.dir}/../boost"/>
 
-  <target name="boost" description="convert to boost">
-    <delete dir="${boost.dir}"/>
+  <presetdef name="bjam">
+    <exec taskname="bjam" failonerror="true" executable="bjam">
+      <arg value="-q"/>
+    </exec>
+  </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>
@@ -139,37 +146,81 @@
     <copy todir="${boost.dir}">
       <fileset dir="boost" includes="LICENSE_1_0.txt,Jamroot.jam,Jamfile.v2"/>
     </copy>
-<!--
+  </target>
+
+  <target name="boost.convert" description="convert boost.mock in ${boost.dir}">
     <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
-      <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+      <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}" includes="**/*.hpp,**/*.cpp"/>
+      <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}" includes="**/*.hpp"/>
+      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp" excludes="**/detail/*.hpp"/>
     </replaceregexp>
     <replaceregexp match='"\.\./([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
-      <fileset dir="${boost.dir}" includes="**/*.hpp"/>
+      <fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
+    </replaceregexp>
+    <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/detail/\1&gt;" flags="g">
+      <fileset dir="${boost.dir}/boost/mock" includes="**/detail/*.hpp"/>
     </replaceregexp>
     <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
-      <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+      <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}" includes="**/*.hpp,**/*.cpp"/>
+      <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}" includes="**/*.hpp,**/*.cpp"/>
+      <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}" includes="**/*.hpp,**/*.cpp"/>
+    <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}" includes="**/*.hpp,**/*.cpp"/>
+      <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">
+      <fileset dir="${boost.dir}/libs/mock" includes="**/*.qbk"/>
+    </replaceregexp>
+    <replaceregexp match="turtle." replace="boost_mock." flags="g">
+      <fileset dir="${boost.dir}/libs/mock" includes="**/*.qbk"/>
+    </replaceregexp>
+    <replaceregexp match="Turtle" replace="Boost.Mock" flags="g">
+      <fileset dir="${boost.dir}/libs/mock" includes="**/*.qbk"/>
     </replaceregexp>
--->
   </target>
 
+  <target name="boost.test" description="run boost.mock tests in ${boost.dir}">
+    <bjam dir="${boost.dir}/libs/mock/test"/>
+  </target>
+
+  <target name="boost.doc" description="generate boost.mock documentation in ${boost.dir}">
+    <bjam dir="${boost.dir}/libs/mock/doc"/>
+  </target>
+
+  <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"/>
+    </zip>
+  </target>
+
+  <target name="documentation" depends="boost.generate,boost.doc"/>
+
+  <target name="boost" depends="boost.generate,boost.convert,boost.doc,boost.test"/>
+
   <target name="all" depends="configure,test,bench,reports,export,package" description="configure, build and run tests and benchmark, export and package distribution"/>
 
 </project>