diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 2bc13a952..4eef005e8 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-23  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter-docs.sgml: Shuffle around non-actor classes.
+
 2007-11-23  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* subclassing-ClutterActor.sgml: Mention the chain-up needed when
diff --git a/doc/reference/clutter-docs.sgml b/doc/reference/clutter-docs.sgml
index 8f38998ad..3a76a1f70 100644
--- a/doc/reference/clutter-docs.sgml
+++ b/doc/reference/clutter-docs.sgml
@@ -75,7 +75,7 @@
     <title>Clutter Core Reference</title>
 
     <chapter>
-      <title>Abstract Classes and Interfaces</title>
+      <title>Abstract classes and interfaces</title>
       <xi:include href="xml/clutter-actor.xml"/>
       <xi:include href="xml/clutter-container.xml"/>
       <xi:include href="xml/clutter-layout.xml"/>
@@ -84,7 +84,7 @@
     </chapter>
 
     <chapter>
-      <title>Base Actors</title>
+      <title>Base actors</title>
       <xi:include href="xml/clutter-stage.xml"/>
       <xi:include href="xml/clutter-rectangle.xml"/>
       <xi:include href="xml/clutter-texture.xml"/>
@@ -94,7 +94,7 @@
     </chapter>
 
     <chapter>
-      <title>Container Actors</title>
+      <title>Container actors</title>
 
       <xi:include href="xml/clutter-group.xml"/>
       <xi:include href="xml/clutter-hbox.xml"/>
@@ -107,7 +107,7 @@
     <title>Clutter Animation Support</title>
 
     <chapter>
-      <title>Base Classes</title>
+      <title>Base classes</title>
 
       <xi:include href="xml/clutter-timeline.xml"/>
       <xi:include href="xml/clutter-alpha.xml"/>
@@ -115,7 +115,7 @@
     </chapter>
 
     <chapter>
-      <title>Clutter Behaviours</title>
+      <title>Behaviours</title>
 
       <xi:include href="xml/clutter-behaviour-bspline.xml"/>
       <xi:include href="xml/clutter-behaviour-depth.xml"/>
@@ -127,7 +127,7 @@
     </chapter>
 
     <chapter>
-      <title>Simple Effects API</title>
+      <title>Simple effects API</title>
 
       <xi:include href="xml/clutter-effect.xml"/>
     </chapter>
@@ -138,25 +138,30 @@
     <title>Clutter Tools</title>
 
     <chapter>
-      <title>General Purpose API</title>
+      <title>General purpose API</title>
 
-      <xi:include href="xml/clutter-main.xml"/>
-      <xi:include href="xml/clutter-event.xml"/>
       <xi:include href="xml/clutter-color.xml"/>
-      <xi:include href="xml/clutter-util.xml"/>
+      <xi:include href="xml/clutter-event.xml"/>
       <xi:include href="xml/clutter-fixed.xml"/>
-      <xi:include href="xml/clutter-model.xml"/>
-      <xi:include href="xml/clutter-model-iter.xml"/>
-      <xi:include href="xml/clutter-version.xml"/>
+      <xi:include href="xml/clutter-main.xml"/>
       <xi:include href="xml/clutter-units.xml"/>
+      <xi:include href="xml/clutter-util.xml"/>
+      <xi:include href="xml/clutter-version.xml"/>
     </chapter>
 
     <chapter>
-      <title>User Interface Definition</title>
+      <title>User interface definition</title>
 
       <xi:include href="xml/clutter-script.xml"/>
       <xi:include href="xml/clutter-scriptable.xml"/>
     </chapter>
+
+    <chapter>
+      <title>Generic list model</title>
+
+      <xi:include href="xml/clutter-model.xml"/>
+      <xi:include href="xml/clutter-model-iter.xml"/>
+    </chapter>
   </part>
 
   <part>