diff --git a/.gitignore b/.gitignore
index 0333c9d70..917592bf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,12 +39,12 @@ doc/reference/clutter/clutter-*.txt
 doc/reference/clutter/html
 doc/reference/clutter/tmpl
 doc/reference/clutter/xml
-doc/reference/clutter/version.xml
 doc/reference/clutter/clutter.args
 doc/reference/clutter/clutter.hierarchy
 doc/reference/clutter/clutter.interfaces
 doc/reference/clutter/clutter.prerequisites
 doc/reference/clutter/clutter.signals
+doc/reference/clutter/clutter-docs.xml
 doc/reference/clutter/*.stamp
 doc/reference/clutter/*.bak
 doc/reference/cogl/cogl-*.txt
@@ -52,12 +52,12 @@ doc/reference/cogl/cogl-*.txt
 doc/reference/cogl/html
 doc/reference/cogl/tmpl
 doc/reference/cogl/xml
-doc/reference/cogl/version.xml
 doc/reference/cogl/cogl.args
 doc/reference/cogl/cogl.hierarchy
 doc/reference/cogl/cogl.interfaces
 doc/reference/cogl/cogl.prerequisites
 doc/reference/cogl/cogl.signals
+doc/reference/cogl/cogl-docs.xml
 doc/reference/cogl/*.stamp
 doc/reference/cogl/*.bak
 doltcompile
diff --git a/configure.ac b/configure.ac
index 419a0c402..49911ee9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -741,9 +741,9 @@ AC_CONFIG_FILES([
         doc/Makefile
         doc/reference/Makefile
         doc/reference/clutter/Makefile
-        doc/reference/clutter/version.xml
+        doc/reference/clutter/clutter-docs.xml
         doc/reference/cogl/Makefile
-        doc/reference/cogl/version.xml
+        doc/reference/cogl/cogl-docs.xml
         doc/manual/clutter-manual.xml
         doc/manual/Makefile
         po/Makefile.in
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index b2489466c..61d7fc16c 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -113,7 +113,6 @@ HTML_IMAGES=\
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files= \
-	version.xml \
 	subclassing-ClutterActor.xml \
         clutter-animation-tutorial.xml \
 	creating-behaviours.xml \
@@ -147,7 +146,6 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += \
-	version.xml.in \
 	actor-box.png \
         easing-modes.png \
         easing-modes.svg \
diff --git a/doc/reference/clutter/clutter-docs.xml b/doc/reference/clutter/clutter-docs.xml.in
similarity index 99%
rename from doc/reference/clutter/clutter-docs.xml
rename to doc/reference/clutter/clutter-docs.xml.in
index 48f0a0fd7..61e1126f2 100644
--- a/doc/reference/clutter/clutter-docs.xml
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
+<!ENTITY version "@VERSION@">
 ]>
 
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
diff --git a/doc/reference/clutter/version.xml.in b/doc/reference/clutter/version.xml.in
deleted file mode 100644
index 7fc1bf340..000000000
--- a/doc/reference/clutter/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@CLUTTER_VERSION@
\ No newline at end of file
diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
index c2f075e4d..9888caaa3 100644
--- a/doc/reference/cogl/Makefile.am
+++ b/doc/reference/cogl/Makefile.am
@@ -71,7 +71,6 @@ HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files = \
-	version.xml \
 	blend-strings.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
@@ -94,4 +93,3 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
diff --git a/doc/reference/cogl/cogl-docs.xml b/doc/reference/cogl/cogl-docs.xml.in
similarity index 98%
rename from doc/reference/cogl/cogl-docs.xml
rename to doc/reference/cogl/cogl-docs.xml.in
index 87d665f42..7f9c1c26b 100644
--- a/doc/reference/cogl/cogl-docs.xml
+++ b/doc/reference/cogl/cogl-docs.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
+<!ENTITY version "@VERSION@">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
 
diff --git a/doc/reference/cogl/version.xml.in b/doc/reference/cogl/version.xml.in
deleted file mode 100644
index 7fc1bf340..000000000
--- a/doc/reference/cogl/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@CLUTTER_VERSION@
\ No newline at end of file