diff --git a/reference/calendar/book.xml b/reference/calendar/book.xml
new file mode 100644
index 0000000000..187848fd75
--- /dev/null
+++ b/reference/calendar/book.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: calendar -->
+<!-- Membership: bundled -->
+ 
+<book xml:id="book.calendar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Calendar</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.calendar">
+  &reftitle.intro;
+  <para>
+   The calendar extension presents a series of functions to simplify
+   converting between different calendar formats.  The intermediary or
+   standard it is based on is the Julian Day Count.  The Julian Day Count is
+   a count of days starting from January 1st, 4713 B.C.  To convert between
+   calendar systems, you must first convert to Julian Day Count, then to the
+   calendar system of your choice.  Julian Day Count is very different from
+   the Julian Calendar! For more information on Julian Day Count, visit
+   <link xlink:href="&url.calendar.jd;">&url.calendar.jd;</link>. For more
+   information on calendar systems visit <link
+   xlink:href="&url.calendar;">&url.calendar;</link>.  Excerpts from this page are
+   included in these instructions, and are in quotes.
+  </para>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.calendar.setup;
+ &reference.calendar.constants;
+ &reference.calendar.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/calendar/constants.xml b/reference/calendar/constants.xml
index 405e76e45d..08a4311849 100644
--- a/reference/calendar/constants.xml
+++ b/reference/calendar/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
-<section xml:id="calendar.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.9 $ -->
+<appendix xml:id="calendar.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -246,7 +246,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/calendar/reference.xml b/reference/calendar/reference.xml
index e77a9ec350..6a6372a480 100644
--- a/reference/calendar/reference.xml
+++ b/reference/calendar/reference.xml
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
-<!-- Purpose: calendar -->
-<!-- Membership: bundled -->
+<!-- $Revision: 1.12 $ -->
 
  <reference xml:id="ref.calendar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Calendar Functions</title>
-  <titleabbrev>Calendar</titleabbrev>
-  <partintro>
-   <section xml:id="calendar.intro">
-    &reftitle.intro;
-    <para>
-     The calendar extension presents a series of functions to simplify
-     converting between different calendar formats.  The intermediary or
-     standard it is based on is the Julian Day Count.  The Julian Day Count is
-     a count of days starting from January 1st, 4713 B.C.  To convert between
-     calendar systems, you must first convert to Julian Day Count, then to the
-     calendar system of your choice.  Julian Day Count is very different from
-     the Julian Calendar! For more information on Julian Day Count, visit
-     <link xlink:href="&url.calendar.jd;">&url.calendar.jd;</link>. For more
-     information on calendar systems visit <link
-     xlink:href="&url.calendar;">&url.calendar;</link>.  Excerpts from this page are
-     included in these instructions, and are in quotes.
-    </para>
-   </section>
-
-   &reference.calendar.configure;
-
-   <section xml:id="calendar.configuration">
-    &reftitle.runtime;
-    &no.config;
-   </section>
-
-   <section xml:id="calendar.resources">
-    &reftitle.resources;
-    &no.resource;
-   </section>
-   &reference.calendar.constants;
-  </partintro>
+  <title>Calendar &Functions;</title>
 
 &reference.calendar.entities.functions;
 
diff --git a/reference/calendar/setup.xml b/reference/calendar/setup.xml
new file mode 100644
index 0000000000..cc8b3d0cab
--- /dev/null
+++ b/reference/calendar/setup.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="calendar.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="calendar.requirements">
+  &reftitle.required;
+  &no.requirement;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.calendar.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="calendar.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="calendar.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
+-->
+