diff --git a/doc/src/advanced.xml b/doc/src/advanced.xml
index c8023d82b..7b22ba8aa 100644
--- a/doc/src/advanced.xml
+++ b/doc/src/advanced.xml
@@ -756,8 +756,8 @@ project tennis
       subprojects, so that every definition made in a parent project
       is always available to its children. The loading order of any
       other projects is unspecified.  Even if one project refers to
-      another via <link
-      linkend="bbv2.advanced.projects.relationships.useprojectrule"><functionname>use-project</functionname></link>,
+      another via <xref
+      linkend="bbv2.advanced.projects.relationships.useprojectrule"><functionname>use-project</functionname></xref>,
       or a target reference, no specific order should be assumed.
       </para>
 
@@ -810,22 +810,22 @@ bjam --help project.<replaceable>rulename</replaceable>
             </row>
             
             <row>
-              <entry><link linkend=
-                  "bbv2.advanced.projects.relationships.useprojectrule">use-project</link></entry>
+              <entry><xref linkend=
+                  "bbv2.advanced.projects.relationships.useprojectrule">use-project</xref></entry>
               
               <entry>Make another project known so that it can be referred to by symbolic ID.</entry>
             </row>
             
             <row>
-              <entry><link linkend=
-                  "bbv2.advanced.projects.relationships.buildprojectrule">build-project</link></entry>
+              <entry><xref linkend=
+                  "bbv2.advanced.projects.relationships.buildprojectrule">build-project</xref></entry>
               
               <entry>Cause another project to be built when this one is built.</entry>
             </row>
             
             <row>
-              <entry><link linkend=
-                  "bbv2.reference.buildprocess.explict">explicit</link></entry>
+              <entry><xref linkend=
+                  "bbv2.reference.buildprocess.explict">explicit</xref></entry>
               
               <entry>State that a target should be built only by explicit
                 request.</entry>
diff --git a/doc/src/extending.xml b/doc/src/extending.xml
index e5d60fc2c..de0ba2a3b 100644
--- a/doc/src/extending.xml
+++ b/doc/src/extending.xml
@@ -114,8 +114,7 @@ and linked it.
   </para>
 
       <para>In the subsequent sections, we will extend this example, and review
-        all the mechanisms in detail. The complete code is available in <ulink url=
-          "../../tools/build/v2/example/customization">example/customization</ulink>
+        all the mechanisms in detail. The complete code is available in <filename>example/customization</filename>
         directory.
       </para>
 
diff --git a/doc/src/install.xml b/doc/src/install.xml
index f8ccb2b93..46885e542 100644
--- a/doc/src/install.xml
+++ b/doc/src/install.xml
@@ -162,7 +162,7 @@ boost-build <replaceable>/path/to/boost.build</replaceable> ;
   <para><emphasis role="bold">N.B.</emphasis>
   When <command>bjam</command> is invoked from anywhere in the Boost
   directory tree <emphasis>other than</emphasis> the Boost.Build root
-  and its subdirectories, <ulink url="../../tools/build">Boost.Build
+  and its subdirectories, <ulink url="../../tools/build/index.html">Boost.Build
   v1</ulink> is used by default. To override the default and use
   Boost.Build v2, you have to add the <option>--v2</option> command
   line option to all <command>bjam</command> invocations.</para>
diff --git a/src/tools/rc.jam b/src/tools/rc.jam
index 9c801e388..388e40858 100644
--- a/src/tools/rc.jam
+++ b/src/tools/rc.jam
@@ -28,6 +28,8 @@ rule resource-compile ( target : sources * : properties * )
             create-empty-object $(target) : $(sources[1]) ;
         case "SOLARIS" :
             create-empty-object $(target) : $(sources[1]) ;
+        case "KFREEBSD" :
+            create-empty-object $(target) : $(sources[1]) ;
         case "LINUX" :
             create-empty-object $(target) : $(sources[1]) ;
         case "*" :