diff --git a/ChangeLog b/ChangeLog
index 87f9f881..5f72dca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	The gettext version checking is causing more trouble than it's
+	curing; remove it.  Problem reported by Paul Hilfinger.
+
+	* bootstrap: Issue a warning that one can expect a message
+	'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION'.
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Remove.
+
 2004-05-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Ensure that the C++ compiler used for testing actually works on a
diff --git a/bootstrap b/bootstrap
index e995f486..d1f48516 100755
--- a/bootstrap
+++ b/bootstrap
@@ -166,6 +166,7 @@ esac
 
 # Reconfigure, getting other files.
 
+echo "$0: Expect an 'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION' warning"
 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 
diff --git a/configure.ac b/configure.ac
index 866edfe6..f7b42501 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,6 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
-AM_GNU_GETTEXT_VERSION([0.14.1])
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)