diff --git a/ChangeLog b/ChangeLog
index 14d4d1a9..e8c729d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-24  Gary V. Vaughan  <gary@gnu.org>
 
+	* m4/libtool.m4 (_LT_DECL_EGREP): Only the newest CVS autoconf
+	AC_SUBSTs for GREP.  Do our own here too to cater for release
+	autoconfen.
+
 	* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [openbsd3.3]: Set
 	need_version to yes or no depending on the os release.
 	Reported by Dalibor Topic <robilad@kaffe.org>
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 49e665da..487f8141 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5782,6 +5782,8 @@ test -z "$GREP" && GREP=grep
 _LT_DECL([], [GREP], [1], [A grep program that handles long line])
 _LT_DECL([], [EGREP], [1], [An ERE matcher])
 _LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
 ])