diff --git a/reference/bbcode/constants.xml b/reference/bbcode/constants.xml
index 28ec41a693..f87ac81a53 100644
--- a/reference/bbcode/constants.xml
+++ b/reference/bbcode/constants.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
-<section xml:id="bbcode.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.6 $ -->
+<appendix xml:id="bbcode.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -298,7 +298,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/bbcode/reference.xml b/reference/bbcode/reference.xml
index 23f51eae21..6a24c5dcf1 100644
--- a/reference/bbcode/reference.xml
+++ b/reference/bbcode/reference.xml
@@ -1,45 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- Membership: external, pecl -->
+<!-- $Revision: 1.6 $ -->
+
 <reference xml:id="ref.bbcode" xmlns="http://docbook.org/ns/docbook">
- <title>BBCode Functions</title>
- <titleabbrev>BBCode</titleabbrev>
+ <title>BBCode &Functions;</title>
 
- <partintro>
-  <section xml:id="bbcode.intro">
-   &reftitle.intro;
-   <para>
-    This extension aims to help parse BBCode text in
-    order to convert it to HTML or another markup language. It uses
-    one pass parsing and provides great speed improvement over the common 
-    approach based on regular expressions. Further more, it helps provide
-    valid HTML by reordering open / close tags and by automatically closing
-    unclosed tags.
-   </para><para>
-    Since 0.10.1 It supports argument quoting with single quotes,
-    double quotes and HTML escaped double quotes.
-   </para>
-  </section>
-  
-  <!-- Information found in configure.xml -->
-  &reference.bbcode.configure;
-
-  <section xml:id="bbcode.configuration">
-   &reftitle.runtime;
-   &no.config;
-  </section>
-
-  <section xml:id="bbcode.resources">
-   &reftitle.resources;
-   <para>
-    One resource is used in the BBCode extension: a BBCode_Container
-    returned by <function>bbcode_create</function>.
-   </para>
-  </section>
-  <!-- Information found in constants.xml -->
-  &reference.bbcode.constants;
- </partintro>
  &reference.bbcode.entities.functions;
+
 </reference>
 
 <!-- Keep this comment at the end of the file
@@ -62,3 +28,4 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
diff --git a/reference/bbcode/setup.xml b/reference/bbcode/setup.xml
new file mode 100644
index 0000000000..63ec89d926
--- /dev/null
+++ b/reference/bbcode/setup.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="bbcode.setup">
+ &reftitle.setup;
+
+ <section xml:id="bbcode.requirements">
+  &reftitle.required;
+  &no.requirement;
+ </section>
+
+ &reference.bbcode.configure;
+
+ <section xml:id="bbcode.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+
+ <section xml:id="bbcode.resources">
+  &reftitle.resources;
+  <para>
+   One resource is used in the BBCode extension: a BBCode_Container
+   returned by <function>bbcode_create</function>.
+  </para>
+ </section>
+
+</chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+