diff --git a/reference/math/book.xml b/reference/math/book.xml
new file mode 100644
index 0000000000..9d670b2b6b
--- /dev/null
+++ b/reference/math/book.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: mathcrypto.math -->
+<!-- Membership: core -->
+ 
+<book xml:id="book.math" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Mathematical Functions</title>
+ <titleabbrev>Math</titleabbrev>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.math">
+  &reftitle.intro;
+  <para>
+   These math functions will only handle values within the range of
+   the <type>integer</type> and <type>float</type> types on your computer
+   (this corresponds currently to the C types long resp. double).
+   If you need to handle bigger numbers, take a look at the <link
+   linkend="book.bc">arbitrary precision math functions</link>.
+  </para>
+  <simpara>
+   See also the manual page on 
+   <link linkend="language.operators.arithmetic">arithmetic
+   operators</link>. 
+  </simpara>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.math.setup;
+ &reference.math.constants;
+ &reference.math.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/math/constants.xml b/reference/math/constants.xml
index 66bb8a9dea..7cfe6afa5c 100644
--- a/reference/math/constants.xml
+++ b/reference/math/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<section xml:id="math.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.5 $ -->
+<appendix xml:id="math.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants.core;
  <para>
@@ -107,7 +107,7 @@
   All other constants are available starting with PHP 4.0.0. Constants
   labeled [5.2.0] were added in PHP 5.2.0.
  </para>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/math/reference.xml b/reference/math/reference.xml
index e195869e10..609e5bfac5 100644
--- a/reference/math/reference.xml
+++ b/reference/math/reference.xml
@@ -1,56 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
-<!-- Purpose: mathcrypto.math -->
-<!-- Membership: core -->
+<!-- $Revision: 1.10 $ -->
 
- <reference xml:id="ref.math" xmlns="http://docbook.org/ns/docbook">
-  <title>Mathematical Functions</title>
-  <titleabbrev>Math</titleabbrev>
-  
-  <partintro>
-   <section xml:id="math.intro">
-    &reftitle.intro;
-    <para>
-     These math functions will only handle values within the range of
-     the <type>integer</type> and <type>float</type> types on your computer
-     (this corresponds currently to the C types long resp. double).
-     If you need to handle bigger numbers, take a look at the <link
-     linkend="ref.bc">arbitrary precision math functions</link>.
-    </para>
-    <simpara>
-     See also the manual page on 
-     <link linkend="language.operators.arithmetic">arithmetic
-     operators</link>. 
-    </simpara>
-   </section>
+<reference xml:id="ref.math" xmlns="http://docbook.org/ns/docbook">
+ <title>Math &Functions;</title>
 
-   <section xml:id="math.requirements">
-    &reftitle.required;
-    &no.requirement;
-   </section>
-   
-   <section xml:id="math.installation">
-    &reftitle.install;
-    &no.install;
-   </section>
+ &reference.math.entities.functions;
 
-   <section xml:id="math.configuration">
-    &reftitle.runtime;
-    &no.config;
-   </section>
+</reference>
 
-   <section xml:id="math.resources">
-    &reftitle.resources;
-    &no.resource;
-   </section>
-
-   &reference.math.constants;
-
-  </partintro>
-
-&reference.math.entities.functions;
-
- </reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/math/setup.xml b/reference/math/setup.xml
new file mode 100644
index 0000000000..1025ab8c5e
--- /dev/null
+++ b/reference/math/setup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="math.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="math.requirements">
+  &reftitle.required;
+  &no.requirement;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ <section xml:id="math.installation">
+  &reftitle.install;
+  &no.install;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="math.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="math.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
+-->
+