diff --git a/ChangeLog b/ChangeLog
index aaf61fc17d..3ccc4c03dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-04-19  Andreas Jaeger  <aj@suse.de>
 
+	* configure.in: Require gettext 0.10.36 or newer.
+
+	* manual/install.texi (Tools for Compilation): Mention gettext
+	0.10.36.
+
 	* po/zh_TW.po: Remove extraneous backslashes.
 
 	* sysdeps/ieee754/dbl-64/e_sqrt.c (__ieee754_sqrt): Remove unused
diff --git a/FAQ b/FAQ
index fcd975d2e7..1a21ffdaf4 100644
--- a/FAQ
+++ b/FAQ
@@ -300,9 +300,7 @@ Binutils 2.10.1 or later is also required.
   `message catalog' files containing translated versions of system
   messages. See ftp://ftp.gnu.org/pub/gnu or better any mirror
   site.  (We distribute compiled message catalogs, but they may not be
-  updated in patches.)  Please note that the required minimal version
-  (0.10.35) of gettext is alpha software and available from
-  ftp://alpha.gnu.org/gnu .
+  updated in patches.)
 
 * Some files are built with special tools.  E.g., files ending in .gperf
   need a `gperf' program.  The GNU version (now available in a separate
diff --git a/FAQ.in b/FAQ.in
index ed67355b00..82d9be9506 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -118,9 +118,7 @@ Binutils 2.10.1 or later is also required.
   `message catalog' files containing translated versions of system
   messages. See ftp://ftp.gnu.org/pub/gnu or better any mirror
   site.  (We distribute compiled message catalogs, but they may not be
-  updated in patches.)  Please note that the required minimal version
-  (0.10.35) of gettext is alpha software and available from
-  ftp://alpha.gnu.org/gnu .
+  updated in patches.)
 
 * Some files are built with special tools.  E.g., files ending in .gperf
   need a `gperf' program.  The GNU version (now available in a separate
diff --git a/INSTALL b/INSTALL
index 5655d5c1f0..85df791f91 100644
--- a/INSTALL
+++ b/INSTALL
@@ -362,8 +362,7 @@ If you change any of the `configure.in' files you will also need
 
 and if you change any of the message translation files you will need
 
-   * GNU `gettext' 0.10.35 or later (version 0.10.35 is a alpha release
-     and available via ftp from alpha.gnu.org/gnu)
+   * GNU `gettext' 0.10.36 or later
 
 You may also need these packages if you upgrade your source tree using
 patches, although we try to avoid this.
@@ -376,6 +375,7 @@ following patterns:
 
      alpha*-*-linux
      arm-*-linux
+     cris-*-linux
      hppa-*-linux
      iX86-*-gnu
      iX86-*-linux
diff --git a/configure b/configure
index cbc9a127b4..d460eb1c6f 100755
--- a/configure
+++ b/configure
@@ -1560,7 +1560,7 @@ echo "configure:1560: checking version of $MSGFMT" >&5
   ac_prog_version=`$MSGFMT --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    0.[1-9][0-9].* | [1-9].*)
+    0.10.3[6-9]*| 0.1[4-9].* |0.[2-9][0-9].* | [1-9].*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
diff --git a/configure.in b/configure.in
index f280af70b6..19184a3983 100644
--- a/configure.in
+++ b/configure.in
@@ -574,7 +574,7 @@ fi
 
 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-  [0.[1-9][0-9].* | [1-9].*], MSGFMT=: aux_missing=t)
+  [0.10.3[6-9]*| 0.1[4-9].* |0.[2-9][0-9].* | [1-9].*], MSGFMT=: aux_missing=t)
 AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
   [4.*], MAKEINFO=: aux_missing=t)
diff --git a/manual/install.texi b/manual/install.texi
index fa8b6183e9..ca3fb5a79f 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -406,8 +406,7 @@ and if you change any of the message translation files you will need
 
 @itemize @bullet
 @item
-GNU @code{gettext} 0.10.35 or later (version 0.10.35 is a alpha release
-and available via ftp from alpha.gnu.org/gnu)
+GNU @code{gettext} 0.10.36 or later
 @end itemize
 
 @noindent