diff --git a/reference/classkit/book.xml b/reference/classkit/book.xml
new file mode 100644
index 0000000000..48f9670361
--- /dev/null
+++ b/reference/classkit/book.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: basic.vartype -->
+<!-- Membership: pecl -->
+
+<book xml:id="book.classkit" xmlns="http://docbook.org/ns/docbook">
+ <title>Classkit Functions</title>
+ <titleabbrev>Classkit</titleabbrev>
+
+ <preface xml:id="intro.classkit">
+  &reftitle.intro;
+  <para>
+   These functions allow the dynamic manipulation of PHP classes, at runtime.
+  </para>
+  <note>
+   <para>
+    This extension has been replaced by
+    <link linkend="book.runkit">runkit</link>, which is not limited to class
+    manipulation but has function manipulation, as well.
+   </para>
+  </note>
+ </preface>
+
+ &reference.classkit.setup;
+ &reference.classkit.constants;
+ &reference.classkit.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/classkit/constants.xml b/reference/classkit/constants.xml
index db7dbeb47f..4e61ed8de0 100644
--- a/reference/classkit/constants.xml
+++ b/reference/classkit/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<section xml:id="classkit.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.3 $ -->
+<appendix xml:id="classkit.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <para>
@@ -40,7 +40,7 @@
    </varlistentry>
   </variablelist>
  </para>
-</section>
+</appendix>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classkit/reference.xml b/reference/classkit/reference.xml
index 8db0c949e1..dab17a2662 100644
--- a/reference/classkit/reference.xml
+++ b/reference/classkit/reference.xml
@@ -1,37 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
-<!-- Purpose: basic.vartype -->
-<!-- Membership: pecl -->
+<!-- $Revision: 1.7 $ -->
 
 <reference xml:id="ref.classkit" xmlns="http://docbook.org/ns/docbook">
  <title>Classkit Functions</title>
- <titleabbrev>Classkit</titleabbrev>
-
- <partintro>
-  <section xml:id="classkit.intro">
-   &reftitle.intro;
-   <para>
-     These functions allow the dynamic manipulation of PHP classes, at runtime.
-   </para>
-   <note>
-    <para>
-     This extension has been replaced by
-     <link linkend="ref.runkit">runkit</link>, which is not limited to class
-     manipulation but has function manipulation, as well.
-    </para>
-   </note>
-  </section>
-
-  &reference.classkit.configure;
-  &reference.classkit.ini;
-
-  <section xml:id="classkit.resources">
-   &reftitle.resources;
-   &no.resource;
-  </section>
-
-  &reference.classkit.constants;
- </partintro>
 
  &reference.classkit.entities.functions;
 
@@ -57,3 +28,4 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
diff --git a/reference/classkit/setup.xml b/reference/classkit/setup.xml
new file mode 100644
index 0000000000..2aa1e561f5
--- /dev/null
+++ b/reference/classkit/setup.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="classkit.setup">
+ &reftitle.setup;
+
+ <section xml:id="classkit.requirements">
+  &reftitle.required;
+  &no.requirement;
+ </section>
+
+ &reference.classkit.configure;
+
+ &reference.classkit.ini;
+
+ <section xml:id="classkit.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
+-->
+