diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ad3b16864ce..3c0c2da2ec9 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -33,6 +33,11 @@ Sat Nov  7 16:02:10 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* mkstemp.c: Likewise.
 	* pexecute.c: Likewise.
 
+Mon Nov  2 15:05:33 1998  Geoffrey Noer  <noer@cygnus.com>
+
+        * configure.in: detect cygwin* instead of cygwin32*
+        * configure: regenerate
+
 Mon Nov  2 10:22:01 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* pexecute.c: Check HAVE_CONFIG_H, not IN_GCC, when determining
@@ -129,6 +134,10 @@ Tue Oct 13 23:51:51 1998  Jeffrey A Law  (law@cygnus.com)
 	* configure.in (AC_CHECK_HEADERS): Check for strings.h too.
 	* config.in, configure: Rebuilt.
 
+Mon Oct 12 19:15:59 1998  Geoffrey Noer  <noer@cygnus.com>
+
+        * configure.in: in comment, call AC_EXEEXT instead of AM_EXEEXT
+
 Sun Oct 11 17:36:06 1998  Michael Tiemann  <tiemann@holodeck.cygnus.com>
 
 	* Makefile.in (cplus-dem.o, obstack.o): Depend upon config.h.
diff --git a/libiberty/configure b/libiberty/configure
index 7c34571ea19..2eac6f3a281 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -1595,10 +1595,10 @@ if test -z "${setobjs}"; then
 
   case "${host}" in
 
-  *-*-cygwin32*)
-    # The cygwin32 library actually uses a couple of files from
+  *-*-cygwin*)
+    # The Cygwin library actually uses a couple of files from
     # libiberty when it is built.  If we are building a native
-    # cygwin32, and we run the tests, we will appear to have these
+    # Cygwin, and we run the tests, we will appear to have these
     # files.  However, when we go on to build winsup, we will wind up
     # with a library which does not have the files, since they should
     # have come from libiberty.
diff --git a/libiberty/configure.in b/libiberty/configure.in
index 1fdfb314617..0b9b35b4785 100644
--- a/libiberty/configure.in
+++ b/libiberty/configure.in
@@ -93,7 +93,7 @@ AC_CONFIG_HEADER(config.h:config.in)
 
 dnl When we start using automake:
 dnl AM_MAINTAINER_MODE
-dnl AM_EXEEXT
+dnl AC_EXEEXT
 
 dnl When we start using automake:
 dnl AM_PROG_INSTALL
@@ -249,10 +249,10 @@ if test -z "${setobjs}"; then
 
   case "${host}" in
 
-  *-*-cygwin32*)
-    # The cygwin32 library actually uses a couple of files from
+  *-*-cygwin*)
+    # The Cygwin library actually uses a couple of files from
     # libiberty when it is built.  If we are building a native
-    # cygwin32, and we run the tests, we will appear to have these
+    # Cygwin, and we run the tests, we will appear to have these
     # files.  However, when we go on to build winsup, we will wind up
     # with a library which does not have the files, since they should
     # have come from libiberty.