diff --git a/reference/xattr/book.xml b/reference/xattr/book.xml
new file mode 100644
index 0000000000..433c4b4819
--- /dev/null
+++ b/reference/xattr/book.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: fileprocess.file -->
+<!-- Membership: pecl, external -->
+ 
+<book xml:id="book.xattr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>xattr</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.xattr">
+  &reftitle.intro;
+  <para>
+   The xattr extension allows for the manipulation of extended attributes on a filesystem.
+  </para>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.xattr.setup;
+ &reference.xattr.constants;
+ &reference.xattr.reference;
+
+</book>
+
+<!-- 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
+-->
+
diff --git a/reference/xattr/constants.xml b/reference/xattr/constants.xml
index 458206947a..e0cf28e324 100644
--- a/reference/xattr/constants.xml
+++ b/reference/xattr/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<section xml:id="xattr.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.4 $ -->
+<appendix xml:id="xattr.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -49,7 +49,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xattr/reference.xml b/reference/xattr/reference.xml
index 4d34194684..1d1bc270e4 100644
--- a/reference/xattr/reference.xml
+++ b/reference/xattr/reference.xml
@@ -1,42 +1,13 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.6 $ -->
-<!-- Purpose: fileprocess.file -->
-<!-- Membership: pecl, external -->
+<!-- $Revision: 1.7 $ -->
 
- <reference xml:id="ref.xattr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>xattr Functions</title>
-  <titleabbrev>xattr</titleabbrev>
+<reference xml:id="ref.xattr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>xattr &Functions;</title>
+ <titleabbrev>xattr</titleabbrev>
 
-  <partintro>
-   <section xml:id="xattr.intro">
-   &reftitle.intro;
-    <para>
-     The xattr extension allows for the manipulation of extended attributes on a filesystem.
-    </para>
-   </section>
+ &reference.xattr.entities.functions;
 
-   <section xml:id="xattr.requirements">
-    &reftitle.required;
-    <para>
-     To use xattr, you will need libattr installed. It is available
-     at <link xlink:href="&url.xattr;">&url.xattr;</link>.
-    </para>
-    <note>
-     <para>
-      These functions only work on filesystems that support extended 
-      attributes, and have them enabled at mount time. Some common
-      filesystems that support extended attributes are ext2, ext3,
-      reiserfs, jfs, and xfs.
-     </para>
-    </note>
-   </section>
-
-   &reference.xattr.configure;
-   &reference.xattr.constants;
-
-  </partintro>
-  &reference.xattr.entities.functions;
- </reference>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xattr/setup.xml b/reference/xattr/setup.xml
new file mode 100644
index 0000000000..0c5ee046bc
--- /dev/null
+++ b/reference/xattr/setup.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="xattr.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="xattr.requirements">
+  &reftitle.required;
+  <para>
+   To use xattr, you will need libattr installed. It is available
+   at <link xlink:href="&url.xattr;">&url.xattr;</link>.
+  </para>
+  <note>
+   <para>
+    These functions only work on filesystems that support extended 
+    attributes, and have them enabled at mount time. Some common
+    filesystems that support extended attributes are ext2, ext3,
+    reiserfs, jfs, and xfs.
+   </para>
+  </note>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.xattr.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="xattr.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="xattr.resources">
+  &reftitle.resources;
+  &no.resource;
+ </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
+-->
+
diff --git a/reference/xdiff/book.xml b/reference/xdiff/book.xml
new file mode 100644
index 0000000000..36702399bc
--- /dev/null
+++ b/reference/xdiff/book.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: basic.text -->
+<!-- Membership: pecl, external -->
+ 
+<book xml:id="book.xdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>xdiff</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.xdiff">
+  &reftitle.intro;
+  <para>
+   xdiff extension creates and applies patches to both text and binary files.
+  </para>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.xdiff.setup;
+ &reference.xdiff.constants;
+ &reference.xdiff.reference;
+
+</book>
+
+<!-- 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
+-->
+
diff --git a/reference/xdiff/constants.xml b/reference/xdiff/constants.xml
index dbd70c3e37..63016dc725 100644
--- a/reference/xdiff/constants.xml
+++ b/reference/xdiff/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<section xml:id="xdiff.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.3 $ -->
+<appendix xml:id="xdiff.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -27,7 +27,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xdiff/reference.xml b/reference/xdiff/reference.xml
index 3939b31fff..5a062d05f1 100644
--- a/reference/xdiff/reference.xml
+++ b/reference/xdiff/reference.xml
@@ -1,39 +1,13 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
-<!-- Purpose: basic.text -->
-<!-- Membership: pecl, external -->
+<!-- $Revision: 1.6 $ -->
 
- <reference xml:id="ref.xdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>xdiff Functions</title>
-  <titleabbrev>xdiff</titleabbrev>
+<reference xml:id="ref.xdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>xdiff &Functions;</title>
+ <titleabbrev>xdiff</titleabbrev>
 
-  <partintro>
-   <section xml:id="xdiff.intro">
-   &reftitle.intro;
-    <para>
-     xdiff extension creates and applies patches to both text and binary files.
-    </para>
-   </section>
-
-   <section xml:id="xdiff.requirements">
-    &reftitle.required;
-    <para>
-     To use xdiff, you will need libxdiff installed, available
-     on the libxdiff homepage <link xlink:href="&url.xdiff;">&url.xdiff;</link>.
-    </para>
-    <note>
-     <para>
-      You'll need at least libxdiff 0.7 for these functions to be aware of memory_limit.
-     </para>
-    </note>
-   </section>
-
-   &reference.xdiff.configure;
-   &reference.xdiff.constants;
-
-  </partintro>
  &reference.xdiff.entities.functions;
- </reference>
+
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xdiff/setup.xml b/reference/xdiff/setup.xml
new file mode 100644
index 0000000000..3d2f4d5a0d
--- /dev/null
+++ b/reference/xdiff/setup.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="xdiff.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="xdiff.requirements">
+  &reftitle.required;
+  <para>
+   To use xdiff, you will need libxdiff installed, available
+   on the libxdiff homepage <link xlink:href="&url.xdiff;">&url.xdiff;</link>.
+  </para>
+  <note>
+   <para>
+    You'll need at least libxdiff 0.7 for these functions to be aware of memory_limit.
+   </para>
+  </note>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.xdiff.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="xdiff.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="xdiff.resources">
+  &reftitle.resources;
+  &no.resource;
+ </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
+-->
+