diff --git a/reference/uodbc/book.xml b/reference/uodbc/book.xml
new file mode 100644
index 0000000000..35778a3cf2
--- /dev/null
+++ b/reference/uodbc/book.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: database.abstract -->
+<!-- Membership: bundled, external -->
+ 
+<book xml:id="book.uodbc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>ODBC</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.uodbc">
+  &reftitle.intro;
+  <para>
+   In addition to normal ODBC support, the Unified ODBC functions in
+   PHP allow you to access several databases that have borrowed the
+   semantics of the ODBC API to implement their own API.  Instead of
+   maintaining multiple database drivers that were all nearly
+   identical, these drivers have been unified into a single set of
+   ODBC functions.
+  </para>
+  <para>
+   The following databases are supported by the Unified ODBC
+   functions: <link xlink:href="&url.adabas;">Adabas D</link>,
+   <link xlink:href="&url.ibmdb2;">IBM DB2</link>,
+   <link xlink:href="&url.iodbc;">iODBC</link>,
+   <link xlink:href="&url.solid;">Solid</link>, and
+   <link xlink:href="&url.sybase;">Sybase SQL Anywhere</link>.
+  </para>
+  <note>
+   <para>
+    With the exception of iODBC, there is no ODBC involved when 
+    connecting to the above databases. The functions that you 
+    use to speak natively to them just happen to share the same 
+    names and syntax as the ODBC functions. However, building PHP 
+    with iODBC support enables you to use any ODBC-compliant 
+    drivers with your PHP applications. More information on iODBC,
+    is available at <link xlink:href="&url.iodbc;">www.iodbc.org</link>
+    with the alternative unixODBC available at 
+    <link xlink:href="&url.unixodbc;">www.unixodbc.org</link>.
+   </para>
+  </note>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.uodbc.setup;
+ &reference.uodbc.constants;
+ &reference.uodbc.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/uodbc/constants.xml b/reference/uodbc/constants.xml
index 0b1a420888..2ac91aaf29 100644
--- a/reference/uodbc/constants.xml
+++ b/reference/uodbc/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<section xml:id="uodbc.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.4 $ -->
+<appendix xml:id="uodbc.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -577,7 +577,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/reference.xml b/reference/uodbc/reference.xml
index 6bad53beeb..c241d62699 100644
--- a/reference/uodbc/reference.xml
+++ b/reference/uodbc/reference.xml
@@ -1,73 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
-<!-- Purpose: database.abstract -->
-<!-- Membership: bundled, external -->
+<!-- $Revision: 1.14 $ -->
 
- <reference xml:id="ref.uodbc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>ODBC Functions (Unified)</title>
-  <titleabbrev>ODBC</titleabbrev>
+<reference xml:id="ref.uodbc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>ODBC Functions (Unified)</title>
 
-  <partintro>
-   <section xml:id="uodbc.intro">
-    &reftitle.intro;
-    <para>
-     In addition to normal ODBC support, the Unified ODBC functions in
-     PHP allow you to access several databases that have borrowed the
-     semantics of the ODBC API to implement their own API.  Instead of
-     maintaining multiple database drivers that were all nearly
-     identical, these drivers have been unified into a single set of
-     ODBC functions.
-    </para>
-    <para>
-     The following databases are supported by the Unified ODBC
-     functions: <link xlink:href="&url.adabas;">Adabas D</link>,
-     <link xlink:href="&url.ibmdb2;">IBM DB2</link>,
-     <link xlink:href="&url.iodbc;">iODBC</link>,
-     <link xlink:href="&url.solid;">Solid</link>, and
-     <link xlink:href="&url.sybase;">Sybase SQL Anywhere</link>.
-    </para>
-    <note>
-     <para>
-      With the exception of iODBC, there is no ODBC involved when 
-      connecting to the above databases. The functions that you 
-      use to speak natively to them just happen to share the same 
-      names and syntax as the ODBC functions. However, building PHP 
-      with iODBC support enables you to use any ODBC-compliant 
-      drivers with your PHP applications. More information on iODBC,
-      is available at <link xlink:href="&url.iodbc;">www.iodbc.org</link>
-      with the alternative unixODBC available at 
-      <link xlink:href="&url.unixodbc;">www.unixodbc.org</link>.
-     </para>
-    </note>
-   </section>
+ &reference.uodbc.entities.functions;
 
-   <section xml:id="uodbc.requirements">
-    &reftitle.required;
-    <para>
-     To access any of the supported databases you need to have
-     the required libraries installed.
-    </para>
-   </section>
-
-   &reference.uodbc.configure;
-
-   &reference.uodbc.ini;
-
-   <section xml:id="uodbc.resources">
-    &reftitle.resources;
-    <para>
-     This extension defines two resource types: an ODBC connection identifier
-     and an ODBC result identifier.
-    </para>
-   </section>
-
-   &reference.uodbc.constants;
-   
-  </partintro>
-
-&reference.uodbc.entities.functions;
-
- </reference>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/uodbc/setup.xml b/reference/uodbc/setup.xml
new file mode 100644
index 0000000000..61aadd55b6
--- /dev/null
+++ b/reference/uodbc/setup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="uodbc.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="uodbc.requirements">
+  &reftitle.required;
+  <para>
+   To access any of the supported databases you need to have
+   the required libraries installed.
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.uodbc.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ &reference.uodbc.ini;
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="uodbc.resources">
+  &reftitle.resources;
+  <para>
+   This extension defines two resource types: an ODBC connection identifier
+   and an ODBC result identifier.
+  </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
+-->
+