diff --git a/documentation/poky-ref-manual/ref-classes.xml b/documentation/poky-ref-manual/ref-classes.xml
index d937334795..78a081f461 100644
--- a/documentation/poky-ref-manual/ref-classes.xml
+++ b/documentation/poky-ref-manual/ref-classes.xml
@@ -1,5 +1,6 @@
 <!DOCTYPE appendix 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; ] >
 
 <appendix id='ref-classes'>
 <title>Reference: Classes</title>
@@ -49,7 +50,7 @@
         This class defines a set of tasks (configure, compile etc.) that 
         work for all Autotooled packages.  
         It should usually be enough to define a few standard variables as documented in the 
-        <link linkend='usingpoky-extend-addpkg-autotools'>Autotooled Package</link> section 
+        "<link linkend='usingpoky-extend-addpkg-autotools'>Autotooled Package</link>" section 
         and then simply <filename>inherit autotools</filename>. 
         This class can also work with software that emulates Autotools.
     </para>
@@ -139,7 +140,7 @@
     </para>
 
     <para>
-        During staging, Bitbake installs such scripts into the 
+        During staging, BitBake installs such scripts into the
         <filename>sysroots/</filename> directory. 
         BitBake also changes all paths to point into the <filename>sysroots/</filename>
         directory so all builds that use the script will use the correct 
@@ -166,7 +167,7 @@
     </para>
 
     <para>
-        During staging, Bitbake installs <filename>pkg-config</filename> data into the 
+        During staging, BitBake installs <filename>pkg-config</filename> data into the
         <filename>sysroots/</filename> directory. 
         By making use of sysroot functionality within <filename>pkg-config</filename>,
         this class no longer has to manipulate the files.
@@ -252,8 +253,8 @@
     <para>
         This class adds the <filename>devshell</filename> task. 
         Distribution policy dictates whether to include this class as the Yocto Project does.
-        See the <link 
-        linkend='platdev-appdev-devshell'>Development Within a Development Shell</link> section 
+        See the 
+        "<link linkend='platdev-appdev-devshell'>Development Within a Development Shell</link>" section 
         for more information about using devshell.
     </para>
 </section>
@@ -313,9 +314,9 @@
         You can find additional information on the effects of the package class at these 
         two Yocto Project mailing list links:
         <itemizedlist>
-            <listitem><para><ulink url='https://lists.yoctoproject.org/pipermail/poky/2011-May/006362.html'>
+            <listitem><para><ulink url='&YOCTO_LISTS_URL;/pipermail/poky/2011-May/006362.html'>
                 https://lists.yoctoproject.org/pipermail/poky/2011-May/006362.html</ulink></para></listitem>
-            <listitem><para><ulink url='https://lists.yoctoproject.org/pipermail/poky/2011-May/006363.html'>
+            <listitem><para><ulink url='&YOCTO_LISTS_URL;/pipermail/poky/2011-May/006363.html'>
                 https://lists.yoctoproject.org/pipermail/poky/2011-May/006363.html</ulink></para></listitem>
         </itemizedlist>
     </para>