diff --git a/ChangeLog b/ChangeLog
index 638e04b854..028e43d038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: renamed version.xml.in to version.in in all API
+	reference manuals.
+
 2003-11-08  Manish Singh  <yosh@gimp.org>
 
 	* libgimp/gimpui.c (gimp_ui_init): #include <stdlib.h> for putenv,
diff --git a/configure.in b/configure.in
index a96c1baaa0..0a5fb99405 100644
--- a/configure.in
+++ b/configure.in
@@ -1162,7 +1162,7 @@ AC_ARG_ENABLE(default-binary, [  --enable-default-binary install this as the def
 AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)
 
 
-AC_ARG_ENABLE(gimp-console, [  --enable-gimp-console build a console-only binary which does not link GTK+ (default=no)], , enable_gimp_console=no)
+AC_ARG_ENABLE(gimp-console, [  --enable-gimp-console   build a console-only binary which does not link GTK+ (default=no)], , enable_gimp_console=no)
 
 AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test x$enable_gimp_console = xyes)
 
@@ -1362,19 +1362,19 @@ plug-ins/winsnap/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/app/Makefile
-devel-docs/app/version.xml
+devel-docs/app/version
 devel-docs/libgimp/Makefile
-devel-docs/libgimp/version.xml
+devel-docs/libgimp/version
 devel-docs/libgimpbase/Makefile
-devel-docs/libgimpbase/version.xml
+devel-docs/libgimpbase/version
 devel-docs/libgimpcolor/Makefile
-devel-docs/libgimpcolor/version.xml
+devel-docs/libgimpcolor/version
 devel-docs/libgimpmath/Makefile
-devel-docs/libgimpmath/version.xml
+devel-docs/libgimpmath/version
 devel-docs/libgimpmodule/Makefile
-devel-docs/libgimpmodule/version.xml
+devel-docs/libgimpmodule/version
 devel-docs/libgimpwidgets/Makefile
-devel-docs/libgimpwidgets/version.xml
+devel-docs/libgimpwidgets/version
 docs/Makefile
 docs/gimp-1.3.1
 docs/gimprc-1.3.5
diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index 330e185563..4da33c340e 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-08  Sven Neumann  <sven@gimp.org>
+
+	* */version.xml.in: renamed to version.in.
+
+	* */*-docs.sgml: include the version number using XInclude.
+
 2003-11-08  Michael Natterer  <mitch@gimp.org>
 
 	* app/app-sections.txt
diff --git a/devel-docs/app/.cvsignore b/devel-docs/app/.cvsignore
index 29c1d4f55c..f18ade076d 100644
--- a/devel-docs/app/.cvsignore
+++ b/devel-docs/app/.cvsignore
@@ -13,5 +13,5 @@ app-undocumented.txt
 html
 tmpl
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml
index 89bcd8bd43..15223c48e0 100644
--- a/devel-docs/app/app-docs.sgml
+++ b/devel-docs/app/app-docs.sgml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
diff --git a/devel-docs/app/version.xml.in b/devel-docs/app/version.in
similarity index 100%
rename from devel-docs/app/version.xml.in
rename to devel-docs/app/version.in
diff --git a/devel-docs/libgimp/.cvsignore b/devel-docs/libgimp/.cvsignore
index 9e607410b1..f7d820018c 100644
--- a/devel-docs/libgimp/.cvsignore
+++ b/devel-docs/libgimp/.cvsignore
@@ -10,5 +10,5 @@ libgimp-unused.txt
 libgimp-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimp/libgimp-docs.sgml b/devel-docs/libgimp/libgimp-docs.sgml
index 4d2d215151..b6d0c13109 100644
--- a/devel-docs/libgimp/libgimp-docs.sgml
+++ b/devel-docs/libgimp/libgimp-docs.sgml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="gimpdefinitions">
diff --git a/devel-docs/libgimp/version.xml.in b/devel-docs/libgimp/version.in
similarity index 100%
rename from devel-docs/libgimp/version.xml.in
rename to devel-docs/libgimp/version.in
diff --git a/devel-docs/libgimpbase/.cvsignore b/devel-docs/libgimpbase/.cvsignore
index 93a22b874a..008dd3478c 100644
--- a/devel-docs/libgimpbase/.cvsignore
+++ b/devel-docs/libgimpbase/.cvsignore
@@ -10,5 +10,5 @@ libgimpbase-unused.txt
 libgimpbase-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimpbase/libgimpbase-docs.sgml b/devel-docs/libgimpbase/libgimpbase-docs.sgml
index bc077e12fd..2ede1d2c71 100644
--- a/devel-docs/libgimpbase/libgimpbase-docs.sgml
+++ b/devel-docs/libgimpbase/libgimpbase-docs.sgml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Base Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="libgimpbase">
diff --git a/devel-docs/libgimpbase/version.xml.in b/devel-docs/libgimpbase/version.in
similarity index 100%
rename from devel-docs/libgimpbase/version.xml.in
rename to devel-docs/libgimpbase/version.in
diff --git a/devel-docs/libgimpcolor/.cvsignore b/devel-docs/libgimpcolor/.cvsignore
index dab6f7a38b..561ab3bba8 100644
--- a/devel-docs/libgimpcolor/.cvsignore
+++ b/devel-docs/libgimpcolor/.cvsignore
@@ -10,5 +10,5 @@ libgimpcolor-unused.txt
 libgimpcolor-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
index 829fdead0c..eed92bf951 100644
--- a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
+++ b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Color Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="libgimpcolor">
diff --git a/devel-docs/libgimpcolor/version.xml.in b/devel-docs/libgimpcolor/version.in
similarity index 100%
rename from devel-docs/libgimpcolor/version.xml.in
rename to devel-docs/libgimpcolor/version.in
diff --git a/devel-docs/libgimpmath/.cvsignore b/devel-docs/libgimpmath/.cvsignore
index 87549678ab..bca10ac807 100644
--- a/devel-docs/libgimpmath/.cvsignore
+++ b/devel-docs/libgimpmath/.cvsignore
@@ -10,5 +10,5 @@ libgimpmath-unused.txt
 libgimpmath-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimpmath/libgimpmath-docs.sgml b/devel-docs/libgimpmath/libgimpmath-docs.sgml
index 2b118fe4fc..32c3e7fca0 100644
--- a/devel-docs/libgimpmath/libgimpmath-docs.sgml
+++ b/devel-docs/libgimpmath/libgimpmath-docs.sgml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Math Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="libgimpmath">
diff --git a/devel-docs/libgimpmath/version.xml.in b/devel-docs/libgimpmath/version.in
similarity index 100%
rename from devel-docs/libgimpmath/version.xml.in
rename to devel-docs/libgimpmath/version.in
diff --git a/devel-docs/libgimpmodule/.cvsignore b/devel-docs/libgimpmodule/.cvsignore
index 2240bf3886..49f03f63e8 100644
--- a/devel-docs/libgimpmodule/.cvsignore
+++ b/devel-docs/libgimpmodule/.cvsignore
@@ -12,5 +12,5 @@ libgimpmodule-unused.txt
 libgimpmodule-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimpmodule/libgimpmodule-docs.sgml b/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
index 4866b792c0..94681ac7a0 100644
--- a/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
+++ b/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
@@ -1,14 +1,14 @@
 <?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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index"  xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Module Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="libgimpmodule">
diff --git a/devel-docs/libgimpmodule/version.xml.in b/devel-docs/libgimpmodule/version.in
similarity index 100%
rename from devel-docs/libgimpmodule/version.xml.in
rename to devel-docs/libgimpmodule/version.in
diff --git a/devel-docs/libgimpwidgets/.cvsignore b/devel-docs/libgimpwidgets/.cvsignore
index ec06a15505..8ec7d6741f 100644
--- a/devel-docs/libgimpwidgets/.cvsignore
+++ b/devel-docs/libgimpwidgets/.cvsignore
@@ -12,5 +12,5 @@ libgimpwidgets-unused.txt
 libgimpwidgets-undocumented.txt
 html
 xml
-version.xml
+version
 *.stamp
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
index 156048ce09..2143a49776 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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">
-]>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <bookinfo>
     <title>GIMP Widgets Library Reference Manual</title>
-    <releaseinfo>for GIMP &version;</releaseinfo>
+    <releaseinfo>
+      for GIMP <xi:include href="version" parse="text"/>
+    </releaseinfo>
   </bookinfo>
 
   <part id="libgimpwidgets-widgets">
diff --git a/devel-docs/libgimpwidgets/version.xml.in b/devel-docs/libgimpwidgets/version.in
similarity index 100%
rename from devel-docs/libgimpwidgets/version.xml.in
rename to devel-docs/libgimpwidgets/version.in