diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 6361821ff4..1ff1ed7559 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -826,6 +826,18 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-BUGTRACKER'><glossterm>BUGTRACKER</glossterm>
+            <glossdef>
+                <para>
+                    Specifies a URL for an upstream bug tracking website for 
+                    a recipe.
+                    The OpenEmbedded build system does not use this variable.
+                    Rather, the variable is a useful pointer in case a bug
+                    in the software being built needs to be manually reported.
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-BUILDDIR'><glossterm>BUILDDIR</glossterm>
             <glossdef>
                 <para>
@@ -877,6 +889,30 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-CLASSOVERRIDE'><glossterm>CLASSOVERRIDE</glossterm>
+            <glossdef>
+                <para>
+                    An internal variable specifying the special class override
+                    that should currently apply (e.g. "class-target", 
+                    "class-native", and so forth).
+                    The classes that use this variable set it to 
+                    appropriate values.
+                </para>
+
+                <para>
+                    You do not normally directly interact with this variable.
+                    The value for the <filename>CLASSOVERRIDE</filename>
+                    variable goes into 
+                    <link linkend='var-OVERRIDES'><filename>OVERRIDES</filename></link>
+                    and then can be used as an override.
+                    Here is an example:
+                    <literallayout class='monospaced'>
+     DEPENDS_append_class-native = " python-native"
+                    </literallayout>
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-COMBINED_FEATURES'><glossterm>COMBINED_FEATURES</glossterm>
             <glossdef>
                 <para>A set of features common between