diff --git a/documentation/overview-manual/overview-manual-yp-intro.xml b/documentation/overview-manual/overview-manual-yp-intro.xml
index 202113068e..1789ef80ee 100644
--- a/documentation/overview-manual/overview-manual-yp-intro.xml
+++ b/documentation/overview-manual/overview-manual-yp-intro.xml
@@ -260,7 +260,8 @@
                         within the BitBake environment and then deploying only
                         the updated packages to the target.</para>
 
-                        <para>The Yocto Project OpenEmbedded build system
+                        <para>The Yocto Project
+                        <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>
                         produces packages in standard formats (i.e. RPM,
                         DEB, IPK, and TAR).
                         You can deploy these packages into the running system
@@ -295,7 +296,9 @@
             The Layer Model simultaneously supports collaboration and
             customization.
             Layers are repositories that contain related sets of instructions
-            that tell the OpenEmbedded build system what to do.
+            that tell the
+            <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>
+            what to do.
             You can collaborate, share, and reuse layers.
         </para>
 
@@ -414,7 +417,8 @@
             and by those using the Yocto Project.
             These components and tools are open source projects and
             metadata that are separate from the reference distribution
-            (Poky) and the OpenEmbedded build system.
+            (Poky) and the
+            <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>.
             Most of the components and tools are downloaded separately.
         </para>
 
@@ -546,10 +550,10 @@
                     <listitem><para>
                         <emphasis>Auto Upgrade Helper:</emphasis>
                         This utility when used in conjunction with the
-                        OpenEmbedded build system (BitBake and OE-Core)
-                        automatically generates upgrades for recipes that
-                        are based on new versions of the recipes published
-                        upstream.
+                        <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>
+                        (BitBake and OE-Core) automatically generates upgrades
+                        for recipes that are based on new versions of the
+                        recipes published upstream.
                         </para></listitem>
                     <listitem><para>
                         <emphasis>Recipe Reporting System:</emphasis>
@@ -682,7 +686,7 @@
 
             <para>
                 The following list consists of components associated with the
-                Open-Embedded build system:
+                <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>:
                 <itemizedlist>
                     <listitem><para>
                         <emphasis>BitBake:</emphasis>
@@ -746,9 +750,10 @@
 
             <para>
                 Poky is the Yocto Project reference distribution.
-                It contains the OpenEmbedded build system (BitBake and OE-Core)
-                as well as a set of metadata to get you started building your
-                own distribution.
+                It contains the
+                <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>Open-Embedded build system</ulink>
+                (BitBake and OE-Core) as well as a set of metadata to get you
+                started building your own distribution.
                 See the
                 <link linkend='what-is-the-yocto-project'>figure</link> in
                 "What is the Yocto Project?" section for an illustration
@@ -933,7 +938,7 @@
                     Regardless of what your Build Host is running, you can
                     use Toaster to develop software using the Yocto Project.
                     Toaster is a web interface to the Yocto Project's
-                    OpenEmbedded build system.
+                    <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>Open-Embedded build system</ulink>.
                     The interface enables you to configure and run your
                     builds.
                     Information about builds is collected and stored in a
@@ -1108,8 +1113,9 @@
         <title>The OpenEmbedded Build System Workflow</title>
 
         <para>
-            The OpenEmbedded build system uses a "workflow" to accomplish
-            image and SDK generation.
+            The
+            <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded build system</ulink>
+            uses a "workflow" to accomplish image and SDK generation.
             The following figure overviews that workflow:
             <imagedata fileref="figures/YP-flow-diagram.png"
                 format="PNG" align='center' width="8in"/>
@@ -1177,8 +1183,9 @@
                     Files that hold global definitions of variables,
                     user-defined variables, and hardware configuration
                     information.
-                    These files tell the OpenEmbedded build system what to
-                    build and what to put into the image to support a
+                    These files tell the
+                    <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>Open-Embedded build system</ulink>
+                    what to build and what to put into the image to support a
                     particular platform.
                     </para></listitem>
                 <listitem><para>
@@ -1218,8 +1225,7 @@
                     <emphasis>Metadata:</emphasis>
                     A key element of the Yocto Project is the Metadata that
                     is used to construct a Linux distribution and is contained
-                    in the files that the
-                    <link linkend='gs-term-openembedded-build-system'>OpenEmbedded build system</link> parses
+                    in the files that the OpenEmbedded build system parses
                     when building an image.
                     In general, Metadata includes recipes, configuration
                     files, and other information that refers to the build