diff --git a/etc/ChangeLog b/etc/ChangeLog
index 75c7f7c6ccc6..95cfd399fd0f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 23 16:46:10 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	*  configure.in: Use AC_PREREQ(2.12.1).
+
 Thu May 14 14:43:10 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/arm-interwork.texi: Document dlltool support of
diff --git a/etc/configure b/etc/configure
index ce51008ac833..55c701a511ca 100755
--- a/etc/configure
+++ b/etc/configure
@@ -623,7 +623,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set) 2>&1 | grep ac_space` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
diff --git a/etc/configure.in b/etc/configure.in
index 9176273de25f..f34241bea1e9 100644
--- a/etc/configure.in
+++ b/etc/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.12.1)
 AC_INIT(Makefile.in)
 
 EGCS_PROG_INSTALL
diff --git a/libchill/ChangeLog b/libchill/ChangeLog
index 8d0a95c2cd6c..ce67b3766cb8 100644
--- a/libchill/ChangeLog
+++ b/libchill/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 23 16:48:39 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	*  configure.in: Use AC_PREREQ(2.12.1).
+
 Fri Nov 20 18:48:34 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* basicio.c (PATH_MAX): Define only to _POSIX_PATH_MAX if that is
diff --git a/libchill/configure.in b/libchill/configure.in
index 9b908fb3859c..0f6f8cb1bdf7 100644
--- a/libchill/configure.in
+++ b/libchill/configure.in
@@ -19,6 +19,7 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
+AC_PREREQ(2.12.1)
 AC_INIT(chillrt0.c)
 
 if test "${srcdir}" = "." ; then
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 9ea04e0f70cc..32872a5205b3 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 23 16:50:28 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	*  configure.in: Use AC_PREREQ(2.12.1).
+
 Thu Nov 19 20:33:37 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* Makefile.in (runtime-info.h): Avoid GNU make extensions.
diff --git a/libobjc/configure.in b/libobjc/configure.in
index d5cdc6a5289d..f3c7c5b16aef 100644
--- a/libobjc/configure.in
+++ b/libobjc/configure.in
@@ -19,6 +19,7 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
+AC_PREREQ(2.12.1)
 AC_INIT(objc/objc.h)
 #AC_CONFIG_HEADER(config.h)