diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index cc7c9aa04..5f64a0f51 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -56,53 +56,53 @@
     <xi:include href="xml/cairo-version.xml"/>
     <xi:include href="xml/cairo-types.xml"/>
   </chapter>
-  <index id="api-index-all">
+  <chapter id="api-index-all">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"/>
-  </index>
+  </chapter>
   <!--index id="deprecated-api-index">
     <title>Index of deprecated symbols</title>
     <xi:include href="xml/api-index-deprecated.xml"/>
   </index-->
-  <index id="api-index-1-0">
+  <chapter id="api-index-1-0">
     <title>Index of new symbols in 1.0</title>
     <xi:include href="xml/api-index-1.0.xml"/>
-  </index>
-  <index id="api-index-1-2">
+  </chapter>
+  <chapter id="api-index-1-2">
     <title>Index of new symbols in 1.2</title>
     <xi:include href="xml/api-index-1.2.xml"/>
-  </index>
-  <index id="api-index-1-4">
+  </chapter>
+  <chapter id="api-index-1-4">
     <title>Index of new symbols in 1.4</title>
     <xi:include href="xml/api-index-1.4.xml"/>
-  </index>
-  <index id="api-index-1-6">
+  </chapter>
+  <chapter id="api-index-1-6">
     <title>Index of new symbols in 1.6</title>
     <xi:include href="xml/api-index-1.6.xml"/>
-  </index>
-  <index id="api-index-1-8">
+  </chapter>
+  <chapter id="api-index-1-8">
     <title>Index of new symbols in 1.8</title>
     <xi:include href="xml/api-index-1.8.xml"/>
-  </index>
-  <index id="api-index-1-10">
+  </chapter>
+  <chapter id="api-index-1-10">
     <title>Index of new symbols in 1.10</title>
     <xi:include href="xml/api-index-1.10.xml"/>
-  </index>
-  <index id="api-index-1-12">
+  </chapter>
+  <chapter id="api-index-1-12">
     <title>Index of new symbols in 1.12</title>
     <xi:include href="xml/api-index-1.12.xml"/>
-  </index>
-  <index id="api-index-1-14">
+  </chapter>
+  <chapter id="api-index-1-14">
     <title>Index of new symbols in 1.14</title>
     <xi:include href="xml/api-index-1.14.xml"/>
-  </index>
-  <index id="api-index-1-16">
+  </chapter>
+  <chapter id="api-index-1-16">
     <title>Index of new symbols in 1.16</title>
     <xi:include href="xml/api-index-1.16.xml"/>
-  </index>
-  <index id="api-index-1-18">
+  </chapter>
+  <chapter id="api-index-1-18">
     <title>Index of new symbols in 1.18</title>
     <xi:include href="xml/api-index-1.18.xml"/>
-  </index>
+  </chapter>
   <xi:include href="language-bindings.xml"/>
 </book>