diff --git a/ChangeLog b/ChangeLog
index 1d30d18ea..f7f950cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-08-18  Billy Biggs  <vektor@dumbterm.net>
+
+	* doc/public/version.xml.in: Add an autoconf-generated version
+	file to advertise what cairo version the manual was generated
+	for.  Idea taken from the GTK+ documentation.
+
+	* doc/public/cairo-docs.xml: Include the version number, along
+	with the title, in a bookinfo section.
+
+	* doc/public/Makefile.am: Add the version.xml.in to the dist.
+
+	* doc/public/.cvsignore: Ignore version.xml.
+
+	* configure.in: Generate doc/public/version.xml.
+
 2005-08-18  Carl Worth  <cworth@cworth.org>
 
 	* Makefile.am: Clear setgid bit on regular files prior to tarring
diff --git a/configure.in b/configure.in
index 07906a014..314fb3df3 100644
--- a/configure.in
+++ b/configure.in
@@ -501,6 +501,7 @@ src/cairo-features.h
 test/Makefile
 doc/Makefile
 doc/public/Makefile
+doc/public/version.xml
 ])
 
 dnl ===========================================================================
diff --git a/doc/public/.cvsignore b/doc/public/.cvsignore
index ff4418d10..2fac445dd 100644
--- a/doc/public/.cvsignore
+++ b/doc/public/.cvsignore
@@ -13,6 +13,4 @@ cairo.args
 cairo.signals
 html
 xml
-
-
-
+version.xml
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index fdd421cb5..1005f6ee1 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -56,4 +56,7 @@ HTML_IMAGES =
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
 
+# Version information for marking the documentation
+EXTRA_DIST=version.xml.in
+
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index 3c894b550..f4e61e194 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?> 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
 <book lang="en" id="cairo" xmlns:xi="http://www.w3.org/2003/XInclude"> 
 <title>Cairo: A Vector Graphics Library</title>
+  <bookinfo>
+    <title>Cairo: A Vector Graphics Library</title>
+    <releaseinfo>for Cairo &version;</releaseinfo>
+  </bookinfo>
   <part>
     <title>Tutorial</title>
   </part>				  
diff --git a/doc/public/version.xml.in b/doc/public/version.xml.in
new file mode 100644
index 000000000..f5e3fc7d7
--- /dev/null
+++ b/doc/public/version.xml.in
@@ -0,0 +1 @@
+@CAIRO_VERSION_MAJOR@.@CAIRO_VERSION_MINOR@.@CAIRO_VERSION_MICRO@