diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 9a8f3af573..fddf215b85 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -339,7 +339,9 @@
             </para>
 
             <para>
-                This file simply makes BitBake aware of the recipes and configuration directories.
+                This file simply makes
+                <ulink url='&YOCTO_DOCS_DEV_URL;#bitbake-term'>BitBake</ulink>
+                aware of the recipes and configuration directories.
                 The file must exist so that the OpenEmbedded build system can recognize the BSP.
             </para>
             </section>
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 4589e4b9fc..64d8110576 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/documentation/kernel-dev/kernel-dev-advanced.xml
@@ -47,7 +47,9 @@
         variable.
         This variable is typically set to the same value as the
         <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
-        variable, which is used by BitBake (e.g. "routerstationpro" or "fri2").
+        variable, which is used by
+        <ulink url='&YOCTO_DOCS_DEV_URL;#bitbake-term'>BitBake</ulink>
+        (e.g. "routerstationpro" or "fri2").
         Multiple BSPs can reuse the same <filename>KMACHINE</filename>
         name if they are built using the same BSP description.
         The "fri2" and "fri2-noemgd" BSP combination
@@ -298,16 +300,16 @@
         </para>
 
         <para>
-            If you modify the Metadata in the linux-yocto 
-            <filename>meta</filename> branch, you must not forget to update 
-            the 
+            If you modify the Metadata in the linux-yocto
+            <filename>meta</filename> branch, you must not forget to update
+            the
             <ulink url='&YOCTO_DOCS_REF_URL;#var-SRCREV'><filename>SRCREV</filename></ulink>
             statements in the kernel's recipe.
-            In particular, you need to update the 
-            <filename>SRCREV_meta</filename> variable to match the commit in 
+            In particular, you need to update the
+            <filename>SRCREV_meta</filename> variable to match the commit in
             the <filename>KMETA</filename> branch you wish to use.
-            Changing the data in these branches and not updating the 
-            <filename>SRCREV</filename> statements to match will cause the 
+            Changing the data in these branches and not updating the
+            <filename>SRCREV</filename> statements to match will cause the
             build to fetch an older commit.
         </para>
     </section>
diff --git a/documentation/kernel-dev/kernel-dev-common.xml b/documentation/kernel-dev/kernel-dev-common.xml
index f73f981ce8..ef1d0dbc5b 100644
--- a/documentation/kernel-dev/kernel-dev-common.xml
+++ b/documentation/kernel-dev/kernel-dev-common.xml
@@ -25,7 +25,9 @@
             If you are going to be modifying kernel recipes, it is recommended
             that you create and prepare your own layer in which to do your
             work.
-            Your layer contains its own BitBake append files
+            Your layer contains its own
+            <ulink url='&YOCTO_DOCS_DEV_URL;#bitbake-term'>BitBake</ulink>
+            append files
             (<filename>.bbappend</filename>) and provides a convenient
             mechanism to create your own recipe files
             (<filename>.bb</filename>).