diff --git a/CHANGES b/CHANGES
index a23e5f71..dcff79ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,8 @@
 * Fix for %rep with no arguments (#560568)
 * Fix concatenation of preprocessor function call  (#794686)
 * Fix long label causes coredump (#677841)
+* Use autoheader as well as autoconf to keep configure from generating
+  ridiculously long command lines.
 
 0.98.37
 -------
diff --git a/configure.in b/configure.in
index 5ab86962..d359399b 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf 2.53 or later to produce
 dnl a configure script.
 AC_PREREQ(2.53)
 AC_REVISION([$Id$])
-AC_INIT(nasm.c)
+AC_INIT(config.h.in)
 AC_CONFIG_HEADERS(config.h)
 
 dnl Check for broken VPATH handling on older NetBSD makes.