diff --git a/intl/ChangeLog.Cygnus b/intl/ChangeLog.Cygnus
index 5e9153999c..f5ee244c30 100644
--- a/intl/ChangeLog.Cygnus
+++ b/intl/ChangeLog.Cygnus
@@ -1,5 +1,9 @@
 Wed Mar 25 15:00:14 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* configure.in: Build config.h from config.in.
+	* config.h.in: Removed.
+	* config.in: New file.
+
 	* config.h.in: New file.
 
 	* configure.in, configure, acconfig.h, aclocal.m4: New files.
diff --git a/intl/config.h.in b/intl/config.in
similarity index 97%
rename from intl/config.h.in
rename to intl/config.in
index e78681f891..8a9049b80d 100644
--- a/intl/config.h.in
+++ b/intl/config.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA
diff --git a/intl/configure b/intl/configure
index fe6354c520..e2b44a96fe 100755
--- a/intl/configure
+++ b/intl/configure
@@ -2885,7 +2885,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3067,7 +3067,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
+  CONFIG_HEADERS="config.h:config.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
diff --git a/intl/configure.in b/intl/configure.in
index d751db185c..d3c9ceab72 100644
--- a/intl/configure.in
+++ b/intl/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(dgettext.c)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h:config.in)
 
 AM_PROG_INSTALL
 CY_GNU_GETTEXT