diff --git a/ChangeLog b/ChangeLog
index 67c12b4d1..cde84beab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-24  Werner Lemberg  <wl@gnu.org>
+
+	* configure: Always remove config.mk, builds/unix/unix-def.mk, and
+	builds/unix/unix-cc.mk.  This fixes repeated calls of the script.
+	Reported by Nelson Beebe and Behdad Esfahbod.
+
 2005-05-23  Werner Lemberg  <wl@gnu.org>
 
 	* builds/amiga/makefile.os4 (WARNINGS), builds/compiler/gcc-dev.mk
diff --git a/configure b/configure
index babb946c3..e8db0c93f 100644
--- a/configure
+++ b/configure
@@ -1,13 +1,10 @@
 #!/bin/sh
 #
-# Call the 'configure' script located in 'builds/unix'.
-#
-# This should re-generate the following files:
-#
-#   config.mk
-#   install
+# Call the `configure' script located in `builds/unix'.
 #
 
+rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+
 if test "x$GNUMAKE" = x; then
   GNUMAKE=make
 fi