diff --git a/.gitignore b/.gitignore
index 6b5439c1..e366d237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ docs/Makefile
 docs/config.*
 docs/configure
 docs/manual.xml
+docs/version.ent
 /templates_c
diff --git a/docs/.cvsignore b/docs/.cvsignore
index f8dcc03d..6f075059 100644
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -3,3 +3,4 @@ Makefile
 manual.xml
 config.*
 *.cache
+version.ent
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 3559c8cc..c8bcd6a4 100755
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -35,7 +35,7 @@ test:
 # {{{ cleanup 
 
 clean:
-	rm -f Makefile config.* manual.xml configure
+	rm -f Makefile config.* manual.xml configure version.ent
 	rm -fr autom4te.cache 
 
 # }}}
diff --git a/docs/configure.in b/docs/configure.in
index ca5ae9c7..9f191103 100755
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -73,7 +73,7 @@ dnl {{{ language specific stuff
 
 AC_MSG_CHECKING(for language)
 
-PHP_BUILD_DATE=`date '+%Y-%m-%d'`
+BUILD_DATE=`date '+%Y-%m-%d'`
 
 AC_ARG_WITH(lang,
 [  --with-lang=LANG        choose a language to work with],[
@@ -89,14 +89,14 @@ AC_ARG_WITH(lang,
       AC_MSG_RESULT($LANG)
     fi
        
-    PHP_BUILD_DATE=`date '+%d-%m-%Y'`
+    BUILD_DATE=`date '+%d-%m-%Y'`
   fi
 ],[
   LANG=en
   AC_MSG_RESULT([en (default)])
 ])
 AC_SUBST(LANG)
-AC_SUBST(PHP_BUILD_DATE)
+AC_SUBST(BUILD_DATE)
 
 dnl }}}
 
diff --git a/docs/en/bookinfo.xml b/docs/en/bookinfo.xml
index ca8bc67a..19fe612e 100755
--- a/docs/en/bookinfo.xml
+++ b/docs/en/bookinfo.xml
@@ -8,11 +8,12 @@
     <firstname>Andrei</firstname><surname>Zmievski &lt;andrei@php.net&gt;</surname>
    </author>
   </authorgroup>
-  <edition>Version 2.0</edition>
+  <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001</year>
    <year>2002</year>
    <year>2003</year>
+   <year>2004</year>
    <holder>ispi of Lincoln, Inc.</holder>
   </copyright>
  </bookinfo>
\ No newline at end of file
diff --git a/docs/manual.xml.in b/docs/manual.xml.in
index dd495b0b..c9b49225 100644
--- a/docs/manual.xml.in
+++ b/docs/manual.xml.in
@@ -1,5 +1,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
           "./dtds/dbxml-4.1.2/docbookx.dtd" [
+<!ENTITY build.version SYSTEM "version.ent">
 <!ENTITY bookinfo SYSTEM "@LANG@/bookinfo.xml">
 <!ENTITY preface SYSTEM "@LANG@/preface.xml">
 <!ENTITY getting.started SYSTEM "@LANG@/getting-started.xml">
diff --git a/docs/version.ent.in b/docs/version.ent.in
new file mode 100755
index 00000000..11904387
--- /dev/null
+++ b/docs/version.ent.in
@@ -0,0 +1 @@
+<!ENTITY build-date "@BUILD_DATE@">