diff --git a/ChangeLog b/ChangeLog
index 034fd0f8..f8733dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug 18 14:27:18 PDT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* configure.in libxslt/xsltconfig.h.in libxslt/xslt.c
+	  libxslt/xsltwin32config.* libexslt/exsltconfig.h.in
+	  libexslt/exslt.c: added some code to include the CVS
+	  ChangeLog version in the version strings available for
+	  printing (e.g. by xsltproc)
+
 Wed Aug 18 00:22:00 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
 	* xsltproc/xsltproc.c: implemented --nodtdattr to avoid defaulting
diff --git a/configure.in b/configure.in
index 64f002cd..b7d60812 100644
--- a/configure.in
+++ b/configure.in
@@ -23,12 +23,17 @@ LIBXSLT_VERSION_INFO=`expr $LIBXSLT_MAJOR_VERSION + $LIBXSLT_MINOR_VERSION`:$LIB
 
 LIBXSLT_VERSION_NUMBER=`expr $LIBXSLT_MAJOR_VERSION \* 10000 + $LIBXSLT_MINOR_VERSION \* 100 + $LIBXSLT_MICRO_VERSION`
 
+if test -f CVS/Entries; then
+  LIBXSLT_VERSION_EXTRA=-CVS`grep ChangeLog CVS/Entries | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%`
+fi
+
 AC_SUBST(LIBXSLT_MAJOR_VERSION)
 AC_SUBST(LIBXSLT_MINOR_VERSION)
 AC_SUBST(LIBXSLT_MICRO_VERSION)
 AC_SUBST(LIBXSLT_VERSION)
 AC_SUBST(LIBXSLT_VERSION_INFO)
 AC_SUBST(LIBXSLT_VERSION_NUMBER)
+AC_SUBST(LIBXSLT_VERSION_EXTRA)
 
 dnl
 dnl libexslt is an extension library
@@ -39,12 +44,17 @@ LIBEXSLT_VERSION_INFO=`expr $LIBEXSLT_MAJOR_VERSION + $LIBEXSLT_MINOR_VERSION`:$
 
 LIBEXSLT_VERSION_NUMBER=`expr $LIBEXSLT_MAJOR_VERSION \* 10000 + $LIBEXSLT_MINOR_VERSION \* 100 + $LIBEXSLT_MICRO_VERSION`
 
+if test -f CVS/Entries; then
+  LIBEXSLT_VERSION_EXTRA=-CVS`grep ChangeLog CVS/Entries | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%`
+fi
+
 AC_SUBST(LIBEXSLT_MAJOR_VERSION)
 AC_SUBST(LIBEXSLT_MINOR_VERSION)
 AC_SUBST(LIBEXSLT_MICRO_VERSION)
 AC_SUBST(LIBEXSLT_VERSION)
 AC_SUBST(LIBEXSLT_VERSION_INFO)
 AC_SUBST(LIBEXSLT_VERSION_NUMBER)
+AC_SUBST(LIBEXSLT_VERSION_EXTRA)
 
 VERSION=${LIBXSLT_VERSION}
 
diff --git a/libexslt/exslt.c b/libexslt/exslt.c
index 4db8f454..36a87e4c 100644
--- a/libexslt/exslt.c
+++ b/libexslt/exslt.c
@@ -19,7 +19,8 @@
 #include "exsltconfig.h"
 #include "exslt.h"
 
-const char *exsltLibraryVersion = LIBEXSLT_VERSION_STRING;
+const char *exsltLibraryVersion = LIBEXSLT_VERSION_STRING 
+				LIBEXSLT_VERSION_EXTRA;
 const int exsltLibexsltVersion = LIBEXSLT_VERSION;
 const int exsltLibxsltVersion = LIBXSLT_VERSION;
 const int exsltLibxmlVersion = LIBXML_VERSION;
diff --git a/libexslt/exsltconfig.h.in b/libexslt/exsltconfig.h.in
index b4a835bd..a45e07b8 100644
--- a/libexslt/exsltconfig.h.in
+++ b/libexslt/exsltconfig.h.in
@@ -34,6 +34,13 @@ extern "C" {
  */
 #define LIBEXSLT_VERSION_STRING "@LIBEXSLT_VERSION_NUMBER@"
 
+/**
+ * LIBEXSLT_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define	LIBEXSLT_VERSION_EXTRA "@LIBEXSLT_VERSION_EXTRA@"
+
 /**
  * WITH_CRYPTO:
  *
diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 80932cc0..5930c766 100644
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -47,7 +47,7 @@
 /* #define WITH_XSLT_DEBUG_BLANKS */
 #endif
 
-const char *xsltEngineVersion = LIBXSLT_VERSION_STRING;
+const char *xsltEngineVersion = LIBXSLT_VERSION_STRING LIBXSLT_VERSION_EXTRA;
 const int xsltLibxsltVersion = LIBXSLT_VERSION;
 const int xsltLibxmlVersion = LIBXML_VERSION;
 
diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
index ef4fc8fa..aa2ecb5f 100644
--- a/libxslt/xsltconfig.h.in
+++ b/libxslt/xsltconfig.h.in
@@ -36,6 +36,13 @@ extern "C" {
  */
 #define LIBXSLT_VERSION_STRING "@LIBXSLT_VERSION_NUMBER@"
 
+/**
+ * LIBXSLT_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define	LIBXSLT_VERSION_EXTRA "@LIBXSLT_VERSION_EXTRA@"
+
 /**
  * WITH_XSLT_DEBUG:
  *
diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index f3aa2bba..bf7df9f9 100644
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -39,6 +39,13 @@ extern "C" {
  */
 #define LIBXSLT_VERSION_STRING "10108"
 
+/**
+ * LIBXSLT_VERSION_EXTRA
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA "-CVS931"
+
 /**
  * WITH_XSLT_DEBUG:
  *
diff --git a/libxslt/xsltwin32config.h.in b/libxslt/xsltwin32config.h.in
index b2e28b8e..0fe59d8f 100644
--- a/libxslt/xsltwin32config.h.in
+++ b/libxslt/xsltwin32config.h.in
@@ -39,6 +39,13 @@ extern "C" {
  */
 #define LIBXSLT_VERSION_STRING "@LIBXSLT_VERSION_NUMBER@"
 
+/**
+ * LIBXSLT_VERSION_EXTRA
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA "@LIBXSLT_VERSION_EXTRA@"
+
 /**
  * WITH_XSLT_DEBUG:
  *