diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index d467ceb8fa..e9143a159a 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -48,7 +48,7 @@
                 This root is what you add to the 
                 <ulink url='&YOCTO_DOCS_REF_URL;#var-BBLAYERS'><filename>BBLAYERS</filename></ulink>
                 variable in the <filename>conf/bblayers.conf</filename> file found in the 
-                <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>Yocto Project Build Directory</ulink>.
+                Yocto Project Build Directory.
                 Adding the root allows the Yocto Project build system to recognize the BSP 
                 definition and from it build an image.
                 Here is an example:
@@ -614,8 +614,7 @@
                 The configuration options will likely end up in that location anyway if the BSP gets 
                 added to the Yocto Project. 
                 For information on how to add these configurations directly, see  
-                <ulink url='http://yoctoproject.org/docs/1.1.1/kernel-manual/kernel-manual.html'>
-                The Yocto Project Kernel Architecture and Use Manual</ulink>.</para>
+                <ulink url='&YOCTO_DOCS_KERNEL_URL;'>The Yocto Project Kernel Architecture and Use Manual</ulink>.</para>
                 <para>
                 In general, however, the Yocto Project maintainers take care of moving the 
                 <filename>SRC_URI</filename>-specified 
@@ -695,8 +694,7 @@
                             <filename>recipe-*</filename> subdirectory.
                             You can find <filename>recipes.txt</filename> in the
                             <filename>meta</filename> directory of the 
-                            <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto 
-                            Project Files</ulink>, or in the OpenEmbedded Core Layer
+                            Yocto Project Files, or in the OpenEmbedded Core Layer
                             (<filename>openembedded-core</filename>) found at 
                             <ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>.
                             </para>
@@ -835,7 +833,7 @@
                             Basing your recipes on these kernels reduces the costs for maintaining 
                             the BSP and increases its scalability.
                             See the <filename>Yocto Linux Kernel</filename> category in the 
-                            <ulink url='&YOCTO_GIT_URL;/cgit.cgi'><filename>Yocto Source Repositories</filename></ulink>
+                            <ulink url='&YOCTO_GIT_URL;/cgit.cgi'>Yocto Source Repositories</ulink>
                             for these kernels.</para></listitem>
                     </itemizedlist>
                 </para>
@@ -1027,8 +1025,7 @@
 
                 <para>
                     Both tools reside in the <filename>scripts/</filename> subdirectory 
-                    of the <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto Project 
-                    Files</ulink>.
+                    of the Yocto Project Files.
                     Consequently, to use the scripts, you must <filename>source</filename> the 
                     environment just as you would when invoking a build:
                     <literallayout class='monospaced'>