diff --git a/reference/svn/book.xml b/reference/svn/book.xml
new file mode 100644
index 0000000000..c62894284f
--- /dev/null
+++ b/reference/svn/book.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: remote.other -->
+<!-- Membership: bundled, pecl -->
+<!-- State: new --> 
+
+<book xml:id="book.svn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Subversion</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.svn">
+  &reftitle.intro;
+  <para>
+   This extension implements PHP bindings for
+   <link xlink:href="&url.svn;">Subversion</link> (SVN), a version
+   control system, allowing PHP scripts to communicate with SVN repositories
+   and working copies without direct command line calls to the
+   <filename>svn</filename>
+   executable.
+  </para>
+  &warn.experimental;
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.svn.setup;
+ &reference.svn.constants;
+ &reference.svn.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/svn/constants.xml b/reference/svn/constants.xml
index 392dd755fb..209dbf9c61 100644
--- a/reference/svn/constants.xml
+++ b/reference/svn/constants.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
-<section xml:id="svn.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.4 $ -->
+<appendix xml:id="svn.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -395,7 +395,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/svn/reference.xml b/reference/svn/reference.xml
index 0b5f2a0c64..dc2392fe50 100644
--- a/reference/svn/reference.xml
+++ b/reference/svn/reference.xml
@@ -1,46 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- Purpose: remote.other -->
-<!-- Membership: bundled, pecl -->
-<!-- State: new -->
+<!-- $Revision: 1.4 $ -->
 <reference xml:id="ref.svn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Subversion &Functions;</title>
  <titleabbrev>SVN</titleabbrev>
- <partintro>
-  <section xml:id="svn.intro">
-   &reftitle.intro;
-   &warn.experimental;
-   <para>
-    This extension implements PHP bindings for
-    <link xlink:href="&url.svn;">Subversion</link> (SVN), a version
-    control system, allowing PHP scripts to communicate with SVN repositories
-    and working copies without direct command line calls to the
-    <filename>svn</filename>
-    executable.
-   </para>
-  </section>
-  <section xml:id="svn.requirements">
-   &reftitle.required;
-   <para>
-    The Subversion binaries are not necessary to use this
-    extension. However, when compiling the extension, libsvn
-    (the Subversion headers) must be available.
-   </para>
-  </section>
-  &reference.svn.configure;
-  <section xml:id="svn.resources">
-   &reftitle.resources;
-   <para>
-    Subversion's lower-level svn_fs_* functions make use of resources
-    that reference local file-system repositories. They can probably be
-    created using <function>svn_repos_fs</function> and 
-    <function>svn_fs_revision_root</function>. (verify?)
-   </para>
-   &no.resource;
-  </section>
-  &reference.svn.constants;
- </partintro>
+
  &reference.svn.entities.functions;
+
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/svn/setup.xml b/reference/svn/setup.xml
new file mode 100644
index 0000000000..f568ed8a69
--- /dev/null
+++ b/reference/svn/setup.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="svn.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="svn.requirements">
+  &reftitle.required;
+  <para>
+   The Subversion binaries are not necessary to use this
+   extension. However, when compiling the extension, libsvn
+   (the Subversion headers) must be available.
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ <section xml:id="svn.installation">
+  &reftitle.install;
+  &no.install;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="svn.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="svn.resources">
+  &reftitle.resources;
+  <!-- FIXME: Wtf?
+  <para>
+   Subversion's lower-level svn_fs_* functions make use of resources
+   that reference local file-system repositories. They can probably be
+   created using <function>svn_repos_fs</function> and 
+   <function>svn_fs_revision_root</function>. (verify?)
+  </para>
+  -->
+  &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
+-->
+