diff --git a/reference/soap/book.xml b/reference/soap/book.xml
new file mode 100644
index 0000000000..72d247cf62
--- /dev/null
+++ b/reference/soap/book.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: webservice -->
+<!-- Membership: bundled, external -->
+ 
+<book xml:id="book.soap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>SOAP</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.soap">
+  &reftitle.intro;
+  <para>
+   The SOAP extension can be used to write SOAP Servers and Clients. It supports
+   subsets of <link xlink:href="&spec.soap1.1;">SOAP 1.1</link>, <link
+   xlink:href="&spec.soap1.2;">SOAP 1.2</link> and <link
+   xlink:href="&spec.wsdl;">WSDL 1.1</link> specifications.
+  </para>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.soap.setup;
+ &reference.soap.constants;
+ &reference.soap.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/soap/constants.xml b/reference/soap/constants.xml
index d42b9942f4..fc6baf763b 100644
--- a/reference/soap/constants.xml
+++ b/reference/soap/constants.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<section xml:id="soap.constants" xmlns="http://docbook.org/ns/docbook">
+<appendix xml:id="soap.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -754,7 +754,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/soap/reference.xml b/reference/soap/reference.xml
index 0237ddcdf7..623b4cf9c6 100644
--- a/reference/soap/reference.xml
+++ b/reference/soap/reference.xml
@@ -1,43 +1,13 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.12 $ -->
-<!-- Purpose: webservice -->
-<!-- Membership: bundled, external -->
-
+<!-- $Revision: 1.13 $ -->
 <reference xml:id="ref.soap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>SOAP Functions</title>
+ <title>SOAP &Functions;</title>
  <titleabbrev>SOAP</titleabbrev>
 
  <partintro>
-  <section xml:id="soap.intro">
-   &reftitle.intro;
-   <para>
-    The SOAP extension can be used to write SOAP Servers and Clients. It supports
-    subsets of <link xlink:href="&spec.soap1.1;">SOAP 1.1</link>, <link
-    xlink:href="&spec.soap1.2;">SOAP 1.2</link> and <link
-    xlink:href="&spec.wsdl;">WSDL 1.1</link> specifications.
-   </para>
-  </section>
-   
-  <section xml:id="soap.requirements">
-   &reftitle.required;
-   <para>
-    This extension makes use of the <link xlink:href="&url.libxml;">GNOME xml
-    library</link>. Download and install this library. You will need at
-    least libxml-2.5.4.
-   </para>
-  </section>
-
-  <section xml:id="soap.installation">
-   &reftitle.install;
-   <para>
-    This extension is only available if PHP was configured with
-    <option role="configure">--enable-soap</option>.
-   </para>
-  </section>
-
-  &reference.soap.ini;
 
   
+  <!-- FIXME: Upgrade to the new-oo-markup -->
   <section xml:id='soap.classes'>
    &reftitle.classes;
 
@@ -196,8 +166,6 @@
    </section>
 
   </section>
-   
-   &reference.soap.constants;
 
   </partintro>
  &reference.soap.entities.functions;
diff --git a/reference/soap/setup.xml b/reference/soap/setup.xml
new file mode 100644
index 0000000000..97d4d2e451
--- /dev/null
+++ b/reference/soap/setup.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="soap.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="soap.requirements">
+  &reftitle.required;
+  <para>
+   This extension makes use of the <link xlink:href="&url.libxml;">GNOME xml
+   library</link>. Download and install this library. You will need at
+   least libxml-2.5.4.
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ <section xml:id="soap.installation">
+  &reftitle.install;
+  <para>
+   This extension is only available if PHP was configured with
+   <option role="configure">--enable-soap</option>.
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ &reference.soap.ini;
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="soap.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
+-->
+