diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index c1a1390b36..943d22a7d8 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -13,14 +13,16 @@
         </question>
         <answer>
             <para>
-                The term "Poky" is sometimes used to refer to the build system that the 
-                Yocto Project uses.  
-                The build system used in the Yocto project is referred to as the 
-                OpenEmbedded build system because "Poky" was derived from <ulink 
-                url='&OE_HOME_URL;'>OpenEmbedded</ulink>.
-                Poky is a stable, smaller subset focused on the mobile environment. 
-                Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
-                features being merged regularly between the two for mutual benefit.
+                The term "Poky" refers to the specific reference build system that
+                the Yocto Project provides.
+                Poky is based on <ulink url='&YOCTO_DOCS_DEV_URL;#oe-core'>OE-Core</ulink>
+                and BitBake.
+                Thus, the generic term used here for the build system is
+                the "OpenEmbedded build system."
+                Development in the Yocto Project using Poky is closely tied to OpenEmbedded, with 
+                changes always being merged to OE-Core or BitBake first before being pulled back
+                into Poky.
+                This practice benefits both projects immediately.
                 For a fuller description of the term "Poky", see the 
                 <ulink url='&YOCTO_DOCS_DEV_URL;#poky'>poky</ulink> term in the Yocto Project
                 Development Manual.