diff --git a/reference/apd/configure.xml b/reference/apd/configure.xml
deleted file mode 100644
index afa6bf6571..0000000000
--- a/reference/apd/configure.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
-<section xml:id="apd.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  APD is currently available as a PECL extension from 
-  <link xlink:href="&url.pecl.package;apd">&url.pecl.package;apd</link>.
- </para>
- <para>
-  Run the following command to download, build, and install the latest stable
-  version of APD:
- <screen>
-<![CDATA[
-pear install apd
-]]>
-  </screen>
- </para>
- <para>
-  This automatically installs the APD Zend module into your PHP
-  extensions directory. It is not mandatory to keep it there; you can
-  store the module in any directory PHP can read as long as you set
-  the zend_extension parameter accordingly.
- </para>
- <para>
-  Windows users will enable <filename>php_apd.dll</filename> inside
-  of &php.ini; in order to use these functions.
-  &pecl.windows.download;
- </para>
- <para>
-  In your INI file, add the following lines:
- </para>
- <para>
-  <programlisting role="php.ini">
-<![CDATA[
-zend_extension = /absolute/path/to/apd.so
-apd.dumpdir = /absolute/path/to/trace/directory
-apd.statement_tracing = 0
-]]>
-  </programlisting>
- </para>
- <para>
-  Depending on your PHP build, the zend_extension directive can be one of the
-  following:
- </para>
- <para>
-  <programlisting role="script">
-<![CDATA[
-zend_extension              (non ZTS, non debug build)
-zend_extension_ts           (    ZTS, non debug build)
-zend_extension_debug        (non ZTS,     debug build)
-zend_extension_debug_ts     (    ZTS,     debug build)
-]]>
-  </programlisting>
- </para>
-</section>
-
-<section xml:id="apd.installwin32">
- <title>Building on Win32</title>
- <para>
-  To build APD under Windows you need a working PHP compilation
-  environment as described on http://php.net/ -- basically, it requires
-  you to have Microsoft Visual C++, win32build.zip, bison/flex, and some know how
-  to get it to work. Also ensure that adp.dsp has DOS line endings; if it has unix
-  line endings, Microsoft Visual C++ will complain about it.
- </para>
-</section>
-
-<!-- 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/apd/setup.xml b/reference/apd/setup.xml
index e9d81e5b46..b1f56c05e2 100644
--- a/reference/apd/setup.xml
+++ b/reference/apd/setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <chapter xml:id="apd.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.setup;
@@ -9,7 +9,70 @@
   &no.requirement;
  </section>
 
- &reference.apd.configure;
+ <section xml:id="apd.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  &reftitle.install;
+  <para>
+   APD is currently available as a PECL extension from 
+   <link xlink:href="&url.pecl.package;apd">&url.pecl.package;apd</link>.
+  </para>
+  <para>
+   Run the following command to download, build, and install the latest stable
+   version of APD:
+   <screen>
+<![CDATA[
+pear install apd
+]]>
+   </screen>
+  </para>
+  <para>
+   This automatically installs the APD Zend module into your PHP
+   extensions directory. It is not mandatory to keep it there; you can
+   store the module in any directory PHP can read as long as you set
+   the zend_extension parameter accordingly.
+  </para>
+  <para>
+   Windows users will enable <filename>php_apd.dll</filename> inside
+   of &php.ini; in order to use these functions.
+   &pecl.windows.download;
+  </para>
+  <para>
+   In your INI file, add the following lines:
+  </para>
+  <para>
+   <programlisting role="php.ini">
+<![CDATA[
+zend_extension = /absolute/path/to/apd.so
+apd.dumpdir = /absolute/path/to/trace/directory
+apd.statement_tracing = 0
+]]>
+   </programlisting>
+  </para>
+  <para>
+   Depending on your PHP build, the zend_extension directive can be one of the
+   following:
+  </para>
+  <para>
+   <programlisting role="script">
+<![CDATA[
+zend_extension              (non ZTS, non debug build)
+zend_extension_ts           (    ZTS, non debug build)
+zend_extension_debug        (non ZTS,     debug build)
+zend_extension_debug_ts     (    ZTS,     debug build)
+]]>
+   </programlisting>
+  </para>
+ </section>
+
+ <section xml:id="apd.installwin32">
+  <title>Building on Win32</title>
+  <para>
+   To build APD under Windows you need a working PHP compilation
+   environment as described on http://php.net/ -- basically, it requires
+   you to have Microsoft Visual C++, win32build.zip, bison/flex, and some know how
+   to get it to work. Also ensure that adp.dsp has DOS line endings; if it has unix
+   line endings, Microsoft Visual C++ will complain about it.
+  </para>
+ </section>
 
  &reference.apd.ini;