diff --git a/reference/muscat/book.xml b/reference/muscat/book.xml
new file mode 100644
index 0000000000..b4c4c1e429
--- /dev/null
+++ b/reference/muscat/book.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: basic.session -->
+<!-- Membership: pecl, external -->
+<!-- State: experimental -->
+
+<book xml:id="book.muscat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>muscat Functions</title>
+ <titleabbrev>muscat</titleabbrev>
+
+ <preface xml:id="intro.muscat">
+  &reftitle.intro;
+  <para>
+   This extension provides an interface to the Muscat 3.6 search system.
+   Muscat doesn't exist anymore, but the <link
+   xlink:href="&url.muscat.xapian;">Xapian</link> project may provide you with a
+   good alternative.
+  </para>
+  &warn.experimental;
+ </preface>
+
+ &reference.muscat.setup;
+ &reference.muscat.constants;
+ &reference.muscat.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/muscat/constants.xml b/reference/muscat/constants.xml
new file mode 100644
index 0000000000..9549928405
--- /dev/null
+++ b/reference/muscat/constants.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+
+<appendix xml:id="muscat.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.constants;
+ &no.constants;
+</appendix>
+
+<!-- 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/muscat/reference.xml b/reference/muscat/reference.xml
index 6ab9b69563..0c92ef4de1 100644
--- a/reference/muscat/reference.xml
+++ b/reference/muscat/reference.xml
@@ -1,41 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
-<!-- Purpose: basic.session -->
-<!-- Membership: pecl, external -->
-<!-- State: experimental -->
+<!-- $Revision: 1.13 $ -->
 
- <reference xml:id="ref.muscat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>muscat Functions</title>
-  <titleabbrev>muscat</titleabbrev>
+<reference xml:id="ref.muscat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>muscat &Functions;</title>
 
-  <partintro>
-   <section xml:id="muscat.intro">
-    &reftitle.intro;
-    <para>
-     This extension provides an interface to the Muscat 3.6 search system.
-     Muscat doesn't exist anymore, but the <link
-     xlink:href="&url.muscat.xapian;">Xapian</link> project may provide you with a
-     good alternative.
-    </para>
-    &warn.experimental;
-   </section>
-   
-   &reference.muscat.configure;
-  
-   <section xml:id="muscat.resources">
-    &reftitle.resources;
-    <para>
-     This extension defines a Muscat session handler returned by
-     <function>muscat_setup_net</function> and
-     <function>muscat_setup</function>.
-    </para>
-   </section>
+ &reference.muscat.entities.functions;
 
-  </partintro>
-
-  &reference.muscat.entities.functions;
-
- </reference>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -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/muscat/setup.xml b/reference/muscat/setup.xml
new file mode 100644
index 0000000000..88160d751f
--- /dev/null
+++ b/reference/muscat/setup.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="muscat.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <section xml:id="muscat.requirements">
+  &reftitle.required;
+  &no.requirement;
+ </section>
+
+ &reference.muscat.configure;
+
+ <section xml:id="muscat.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+
+ <section xml:id="muscat.resources">
+  &reftitle.resources;
+  <para>
+   This extension defines a Muscat session handler returned by
+   <function>muscat_setup_net</function> and
+   <function>muscat_setup</function>.
+  </para>
+ </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
+-->
+