diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index b4f667f..6b8a592 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -12,6 +12,7 @@ using doxygen ;
 import boostbook ;
 import regex ;
 import os ;
+import path ;
 
 doxygen_files =
     additive_combine
@@ -44,10 +45,16 @@ doxygen_files =
     xor_combine
 ;
 
-# temporary hack for local docs
-local BOOST_ROOT = ../../../.. ;
-
 path-constant here : . ;
+path-constant boost-root : ../../.. ;
+
+# Figure out where the root of the boost tree is relative
+# to the html directory.
+local BOOST_ROOT = [ path.relative-to
+                       [ path.join [ path.pwd ] html ]
+                       [ path.root
+                           [ path.make $(boost-root) ]
+                           [ path.pwd ] ] ] ;
 
 doxygen reference :
     $(here)/../../../boost/random/$(doxygen_files).hpp
@@ -60,6 +67,7 @@ doxygen reference :
         endxmlnote=\"@xmlonly </para></note> @endxmlonly\" \\
         blockquote=\"@xmlonly <blockquote><para> @endxmlonly\" \\
         endblockquote=\"@xmlonly </para></blockquote> @endxmlonly\" \\
+        boost=\"$(BOOST_ROOT)\" \\
         random_distribution=\"@xmlonly <link linkend=\\\"boost_random.reference.concepts.random_distribution\\\">random distribution</link> @endxmlonly\" \\
         pseudo_random_number_generator=\"@xmlonly <link linkend=\\\"boost_random.reference.concepts.pseudo_random_number_generator\\\">pseudo-random number generator</link> @endxmlonly\" \\
         uniform_random_number_generator=\"@xmlonly <link linkend=\\\"boost_random.reference.concepts.uniform_random_number_generator\\\">uniform random number generator</link> @endxmlonly\" \\
diff --git a/doc/random.qbk b/doc/random.qbk
index 0f9fcb7..862012c 100644
--- a/doc/random.qbk
+++ b/doc/random.qbk
@@ -84,7 +84,7 @@ random numbers having useful properties, such as uniform distribution.
 
 You should read the [concepts concepts documentation] for an introduction and the
 definition of the basic concepts. For a quick start, it may be sufficient
-to have a look at [@boost:/libs/random/random_demo.cpp random_demo.cpp].
+to have a look at [@boost:/libs/random/example/random_demo.cpp random_demo.cpp].
 
 For a very quick start, here's an example:
 
diff --git a/include/boost/nondet_random.hpp b/include/boost/nondet_random.hpp
index 959103b..12e1828 100644
--- a/include/boost/nondet_random.hpp
+++ b/include/boost/nondet_random.hpp
@@ -70,7 +70,7 @@ namespace boost {
  *
  * <b>Performance</b>
  *
- * The test program <a href="\boost/libs/random/nondet_random_speed.cpp">
+ * The test program <a href="\boost/libs/random/performance/nondet_random_speed.cpp">
  * nondet_random_speed.cpp</a> measures the execution times of the
  * nondet_random.hpp implementation of the above algorithms in a tight
  * loop. The performance has been evaluated on a Pentium Pro 200 MHz