diff --git a/reference/iconv/book.xml b/reference/iconv/book.xml
new file mode 100644
index 0000000000..fc39849cc5
--- /dev/null
+++ b/reference/iconv/book.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: international -->
+<!-- Membership: bundled --> 
+
+<book xml:id="book.iconv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>iconv</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.iconv">
+  &reftitle.intro;
+  <para>
+   This module contains an interface to iconv character set conversion
+   facility. With this module, you can turn a string represented by a local
+   character set into the one represented by another character set,
+   which may be the Unicode character set. Supported character sets
+   depend on the iconv implementation of your system.
+   Note that the iconv function on some systems may not work
+   as you expect. In such case, it'd be a good idea to install the
+   <link xlink:href="&url.libiconv;">GNU libiconv</link> library. It will most
+   likely end up with more consistent results.
+  </para>
+
+  <para>
+   Since <application>PHP</application> 5.0.0, this extension comes with
+   various utility functions that help you to write multilingual
+   scripts. Let's have a look at the following sections to explore the new
+   features.
+  </para> 
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.iconv.setup;
+ &reference.iconv.constants;
+ &reference.iconv.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/iconv/constants.xml b/reference/iconv/constants.xml
index e8b493b6f2..f2b459523c 100644
--- a/reference/iconv/constants.xml
+++ b/reference/iconv/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<section xml:id="iconv.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.6 $ -->
+<appendix xml:id="iconv.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  <para>
   Since <application>PHP</application> 4.3.0 it is possible to identify at
@@ -64,7 +64,7 @@
    </tgroup>
   </table>
  </para>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/iconv/reference.xml b/reference/iconv/reference.xml
index ed026b959e..5a9f902b81 100644
--- a/reference/iconv/reference.xml
+++ b/reference/iconv/reference.xml
@@ -1,67 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
-<!-- Purpose: international -->
-<!-- Membership: bundled -->
+<!-- $Revision: 1.20 $ -->
 
  <reference xml:id="ref.iconv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>iconv Functions</title>
+  <title>iconv &Functions;</title>
   <titleabbrev>iconv</titleabbrev>
 
   <partintro>
-   <section xml:id="iconv.intro">
-    &reftitle.intro;
-    <para>
-     This module contains an interface to iconv character set conversion
-     facility. With this module, you can turn a string represented by a local
-     character set into the one represented by another character set,
-     which may be the Unicode character set. Supported character sets
-     depend on the iconv implementation of your system.
-     Note that the iconv function on some systems may not work
-     as you expect. In such case, it'd be a good idea to install the
-     <link xlink:href="&url.libiconv;">GNU libiconv</link> library. It will most
-     likely end up with more consistent results.
-    </para>
-
-    <para>
-     Since <application>PHP</application> 5.0.0, this extension comes with
-     various utility functions that help you to write multilingual
-     scripts. Let's have a look at the following sections to explore the new
-     features.
-    </para> 
-   </section>
-
-   <section xml:id="iconv.requirements">
-    &reftitle.required;
-    <para>
-     You will need nothing if the system you are using is one of the recent
-     POSIX-compliant systems because standard C libraries that are supplied in
-     them must provide iconv facility. Otherwise, you have to get the
-     <link xlink:href="&url.libiconv;">libiconv</link> library installed in
-     your system.
-    </para>
-   </section>
-
-   &reference.iconv.configure;
-
-   &reference.iconv.ini;
-
-   <section xml:id="iconv.resources">
-    &reftitle.resources;
-    &no.resource;
-   </section>
-
-   &reference.iconv.constants;
-
-   <section xml:id="iconv.seealso">
-    &reftitle.seealso;
-    <para>
-     See also <link linkend="ref.recode">GNU Recode functions</link>.
-    </para>
-   </section>
-
+   &reftitle.seealso;
+   <para>
+    See also <link linkend="ref.recode">GNU Recode functions</link>.
+   </para>
   </partintro>
 
-&reference.iconv.entities.functions;
+ &reference.iconv.entities.functions;
 
  </reference>
 <!-- Keep this comment at the end of the file
diff --git a/reference/iconv/setup.xml b/reference/iconv/setup.xml
new file mode 100644
index 0000000000..2b1cc58fa1
--- /dev/null
+++ b/reference/iconv/setup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="iconv.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="iconv.requirements">
+  &reftitle.required;
+  <para>
+   You will need nothing if the system you are using is one of the recent
+   POSIX-compliant systems because standard C libraries that are supplied in
+   them must provide iconv facility. Otherwise, you have to get the
+   <link xlink:href="&url.libiconv;">libiconv</link> library installed in
+   your system.
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.iconv.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ &reference.iconv.ini;
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="iconv.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
+-->
+