diff --git a/ChangeLog b/ChangeLog
index cf529f6f..e87531a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-01-22  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* Makefile.am (ltconfig, ltmain.sh): add ChangeLog Revision to
+	TIMESTAMP
+	* configure.in: get values of PACKAGE and VERSION set by
+	AM_INIT_AUTOMAKE, and extract only TIMESTAMP from the ChangeLog
+
 	* libltdl/ltdl.c (lt_dlopen): if we're reusing a previously opened
 	handle, don't reset its name nor add it to the list, and free the
 	name we have allocated
@@ -3596,4 +3601,4 @@ Thu May 28 18:59:08 1998  Ian Lance Taylor  <ian@cygnus.com>
 
 	* For historical reasons: this is when I started writing libtool.
 
-	$Date$
+	$Revision$ $Date$
diff --git a/Makefile.am b/Makefile.am
index 461c12a8..ba6f0fdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ update-timestamps:
 # Line numbering transliterated from a section in autoconf (Autoconf 2.12).
 $(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
 	rm -f ltconfig.T
-	date=`sed 's%.*\$$''Date: \([^$$]*\) \$$.*% (\1)%;t;d' \
+	date=`sed 's%.*\$$''Revision: \([^$$]*\) \$$ \$$''Date: \([^$$]*\) \$$.*% (\1 \2)%;t end;d;: end' \
 		< $(srcdir)/ChangeLog` && \
 	$(AWK) '/@LINENO@/ { printf "%d:", NR } { print }' $(srcdir)/ltconfig.in | \
 	  sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
@@ -74,7 +74,7 @@ $(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
 
 $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in $(TSDEPS)
 	rm -f ltmain.shT
-	date=`sed 's%.*\$$''Date: \([^$$]*\) \$$.*% (\1)%;t;d' \
+	date=`sed 's%.*\$$''Revision: \([^$$]*\) \$$ \$$''Date: \([^$$]*\) \$$.*% (\1 \2)%;t end;d;: end' \
 		< $(srcdir)/ChangeLog` && \
 	sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
 	    -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
diff --git a/configure.in b/configure.in
index ce061c25..8fb8eb53 100644
--- a/configure.in
+++ b/configure.in
@@ -2,32 +2,28 @@ dnl Process this file with autoconf to create configure.
 
 AC_INIT(ltmain.in)
 
+AM_INIT_AUTOMAKE(libtool, 1.2e)
+
 # This is a sanity check so we can see which version is used in bug reports.
 # It is assumed that we only want to see the date extension for cvs libtool
 # versions (i.e. "odd" letters) and not actual alpha releases.
-version=`egrep '^[AM_INIT_AUTOMAKE]' $srcdir/configure.in | \
-	  sed 's/^.*,//;s/).*$//'`
-date=
+case "$VERSION" in
 changequote(,)
-case $version in
   *[acegikmoqsuwy]) 
-    date=`sed 's%.*\$''Date: \([0-9 /]*[0-9:]*\) \$.*% (\1)%;t;d' < \
-      $srcdir/ChangeLog`
+    TIMESTAMP=`sed 's%.*\$''Revision: \([^$]*\) \$ \$''Date: \([^$]*\) \$.*% (\1 \2)%;t end;d;: end' < ${srcdir}/ChangeLog`
+changequote([,])
+    banner="Configuring $PACKAGE $VERSION$TIMESTAMP"
+    dashes=`echo "$banner" | sed 's/./-/g'`
+
+    # Display an obvious version banner
+    echo
+    echo $dashes
+    echo "$banner"
+    echo $dashes
+    echo
     ;;
 esac    
-changequote([,])
-banner="Configuring libtool-$version$date"
-dashes=`echo "$banner" | sed 's/./-/g'`
 
-# Display an obvious version banner
-echo $dashes
-echo "$banner"
-echo $dashes
-echo
-
-AM_INIT_AUTOMAKE(libtool, 1.2e)
-
-AC_SUBST(pkgdatadir)
 aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)