diff --git a/doc/sf_and_dist/Jamfile.v2 b/doc/sf_and_dist/Jamfile.v2
index b0f4ab086..ebc4d2c04 100644
--- a/doc/sf_and_dist/Jamfile.v2
+++ b/doc/sf_and_dist/Jamfile.v2
@@ -7,17 +7,19 @@ using quickbook ;
 
 path-constant images_location : html ;
 
+path-constant boost-root : [ get-boost-path ] ;
+
 xml math : math.qbk ;
 boostbook standalone
     :
         math
     :
         # Path for links to Boost:
-        <xsl:param>boost.root=../../../../../../../trunk
+        <xsl:param>boost.root=file://$(boost-root:T)
         # Path for libraries index:
-        <xsl:param>boost.libraries=$(boost-root)/libs/libraries.htm
+        <xsl:param>boost.libraries=file://$(boost-root:T)/libs/libraries.htm
         # Use the main Boost stylesheet:
-        <xsl:param>html.stylesheet=../../../../../../../trunk/doc/html/boostbook.css
+        <xsl:param>html.stylesheet=file://$(boost-root:T)/doc/html/boostbook.css
         
         # Some general style settings:
         <xsl:param>table.footnote.number.format=1
@@ -73,3 +75,5 @@ boostbook standalone
 install pdf-install : standalone : <location>. <install-type>PDF ;
 
 
+
+
diff --git a/project-root.jam b/project-root.jam
index 8519828e2..146f0ef28 100644
--- a/project-root.jam
+++ b/project-root.jam
@@ -53,8 +53,9 @@ project math-toolkit
 
 
 
-
-
-
+rule get-boost-path
+{
+   return $(boost-root) ;
+}