diff --git a/documentation/poky-ref-manual/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index 2a825d6e22..c16e0f116c 100644
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -1,5 +1,6 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
 <chapter id='extendpoky'>
 
@@ -24,7 +25,7 @@
             variables.
             For information on variables that are useful for recipes and for information about recipe naming
             issues, see the 
-            <link linkend='ref-varlocality-recipe-required'>Required</link> section for recipe variables.
+            "<link linkend='ref-varlocality-recipe-required'>Required</link>" section for recipe variables.
         </para>
 
         <para>
@@ -114,7 +115,7 @@
             <para>
                 The variable <filename><link linkend='var-LIC_FILES_CHKSUM'>LIC_FILES_CHKSUM</link>
                 </filename> is used to track source license changes as described in the
-                <link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>Track License Change</link>
+                "<link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>Track License Change</link>"
                 section. 
                 You can quickly create Autotool-based recipes in a manner similar to the previous example.
             </para>
@@ -532,10 +533,9 @@
         <para>
             For a complete example that shows how to add a new machine to the Yocto Project, 
             see the 
-            <ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#dev-manual-bsp-appendix'>
+            <ulink url='&YOCTO_DOCS_DEV_URL;#dev-manual-bsp-appendix'>
             BSP Development Example</ulink> in Appendix A of  
-            <ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html'>
-            The Yocto Project Development Manual</ulink>.
+            The Yocto Project Development Manual.
         </para>
 
         <section id="platdev-newmachine-conffile">
@@ -786,7 +786,7 @@
         <para>
             This section overviews the Multilib process only. 
             For more details on how to implement Multilib, see the 
-            <ulink url='https://wiki.yoctoproject.org/wiki/Multilib'>Multilib</ulink> wiki 
+            <ulink url='&YOCTO_WIKI_URL;/wiki/Multilib'>Multilib</ulink> wiki 
             page.
         </para>
 
@@ -1321,7 +1321,7 @@
                 Experience shows that buildbot is a good fit for this role. 
                 What works well is to configure buildbot to make two types of builds:
                 incremental and full (from scratch).  
-                See <ulink url='http://www.yoctoproject.org:8010'>the buildbot for the 
+                See <ulink url='&YOCTO_HOME_URL;:8010'>the buildbot for the 
                 Yocto Project</ulink> for an example implementation that uses buildbot.
             </para>