diff --git a/reference/ccvs/book.xml b/reference/ccvs/book.xml
new file mode 100644
index 0000000000..d2e54383e1
--- /dev/null
+++ b/reference/ccvs/book.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- State: deprecated -->
+ 
+<book xml:id="book.ccvs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>CCVS API Functions [deprecated]</title>
+ <titleabbrev>CCVS</titleabbrev>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.ccvs">
+  &reftitle.intro;
+  <para>
+   These functions interface the CCVS API, allowing you to work
+   directly with CCVS from your PHP scripts.  CCVS is <link
+   xlink:href="&url.redhat;">RedHat's</link> solution to the "middle-man"
+   in credit card processing.  It lets you directly address the
+   credit card clearing houses via your *nix box and a modem.  Using
+   the CCVS module for PHP, you can process credit cards directly
+   through CCVS via your PHP Scripts.  The following references will
+   outline the process.
+  </para>
+  <warning>
+   <para>
+    CCVS has been discontinued by Red Hat and there are no plans
+    to issue further keys or support contracts. Those looking for a 
+    replacement can consider 
+    <link xlink:href="&url.redhat.mcve;">MCVE by Main Street Softworks</link>
+    as a potential replacement. It is similar in design and has documented
+    PHP support!
+   </para>
+   <para>
+    This extension has been removed from PHP and is no
+    longer available as of PHP 4.3.0. If you want to use credit card
+    processing features you can use <link linkend="book.mcve">MCVE</link>
+    instead.
+   </para>
+  </warning>
+ </preface>
+ <!-- }}} -->
+
+ &reference.ccvs.configure;
+ &reference.ccvs.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/ccvs/configure.xml b/reference/ccvs/configure.xml
index 4f18163181..7c51554539 100644
--- a/reference/ccvs/configure.xml
+++ b/reference/ccvs/configure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<section xml:id="ccvs.installation" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.3 $ -->
+<appendix xml:id="ccvs.installation" xmlns="http://docbook.org/ns/docbook">
  &reftitle.install;
  <para xml:id="ccvs.configure">
   To enable CCVS Support in PHP, first verify your CCVS installation
@@ -22,7 +22,7 @@
   if you installed CCVS as user 'ccvs', your PHP processes must run as 'ccvs' as
   well.)
  </para>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/ccvs/reference.xml b/reference/ccvs/reference.xml
index 5a02010a81..bbd557d2a2 100644
--- a/reference/ccvs/reference.xml
+++ b/reference/ccvs/reference.xml
@@ -1,55 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
-<!-- State: deprecated -->
+<!-- $Revision: 1.19 $ -->
 
-<!-- 
-CCVS Documentation by Brendan W. McAdams <brendan@plexmedia.com>
-Copyright (c) 2000 by the PHP Group
+<reference xml:id="ref.ccvs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>CCVS API Functions [deprecated]</title>
+ <titleabbrev>CCVS</titleabbrev>
 
--Special Thanks to Red Hat, Inc. for the contribution of their original
-documentation for the PHP 3 version of this module, which helped us
-start this document.  
--->
- 
- <reference xml:id="ref.ccvs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>CCVS API Functions [deprecated]</title>
-  <titleabbrev>CCVS</titleabbrev>
-
-  <partintro>
-
-   <section xml:id="ccvs.intro">
-    &reftitle.intro;
-    <para>
-     These functions interface the CCVS API, allowing you to work
-     directly with CCVS from your PHP scripts.  CCVS is <link
-     xlink:href="&url.redhat;">RedHat's</link> solution to the "middle-man"
-     in credit card processing.  It lets you directly address the
-     credit card clearing houses via your *nix box and a modem.  Using
-     the CCVS module for PHP, you can process credit cards directly
-     through CCVS via your PHP Scripts.  The following references will
-     outline the process.
-    </para>
-    <note>
-     <para>
-      CCVS has been discontinued by Red Hat and there are no plans
-      to issue further keys or support contracts. Those looking for a 
-      replacement can consider 
-      <link xlink:href="&url.redhat.mcve;">MCVE by Main Street Softworks</link>
-      as a potential replacement. It is similar in design and has documented
-      PHP support!
-     </para>
-     <para>
-      This extension has been removed from PHP and is no
-      longer available as of PHP 4.3.0. If you want to use credit card
-      processing features you can use <link linkend="ref.mcve">MCVE</link>
-      instead.
-     </para>
-    </note>
-   </section>
-   
-   &reference.ccvs.configure;
-
-   <section xml:id="ccvs.seealso">
+ <partintro>
+  <section xml:id="ccvs.seealso">
     &reftitle.seealso;
     <para>
      RedHat has discontinued support for CCVS; however, a slightly
@@ -57,12 +14,12 @@ start this document.
      <link xlink:href="&url.redhat.support;">&url.redhat.support;</link>. 
     </para>
    </section>
-
   </partintro>
 
-&reference.ccvs.entities.functions;
+ &reference.ccvs.entities.functions;
+
+</reference>
 
- </reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml