diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index d619056355..a95203f221 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
-<appendix id='faq'>
+<chapter id='faq'>
 <title>FAQ</title>
 <qandaset>
     <qandaentry>
@@ -620,7 +620,7 @@
 
 
 </qandaset>
-</appendix>
+</chapter>
 <!-- 
 vim: expandtab tw=80 ts=4 
 -->
diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 55889ac4ee..efcb159c3d 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -78,8 +78,8 @@
                 <link linkend='ref-varlocality'>Variable Context</link>:</emphasis> 
                 This chapter provides variable locality or context.</para></listitem>
             <listitem><para><emphasis>
-                <link linkend='faq'>Reference: FAQ</link>:</emphasis> 
-                This appendix provides answers for commonly asked questions in the Yocto Project
+                <link linkend='faq'>FAQ</link>:</emphasis> 
+                This chapter provides answers for commonly asked questions in the Yocto Project
                 development environment.</para></listitem>
             <listitem><para><emphasis>
                 <link linkend='resources'>Reference: Contributing to the Yocto Project</link>:</emphasis> 
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index c01d5a6236..42ee48b68b 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -56,7 +56,7 @@
             <listitem><para><emphasis>FAQs:</emphasis> Lists commonly asked Yocto Project questions and answers.
                 You can find two FAQs: <ulink url='&YOCTO_WIKI_URL;/wiki/FAQ'>Yocto Project FAQ</ulink> on 
                 a wiki, and the 
-                <ulink url='&YOCTO_DOCS_REF_URL;#faq'>FAQ</ulink> appendix in  
+                <ulink url='&YOCTO_DOCS_REF_URL;#faq'>FAQ</ulink> chapter in  
                 the Yocto Project Reference Manual.
                 </para></listitem>
             <listitem><para><emphasis>Developer Screencast:</emphasis> The