diff --git a/ChangeLog b/ChangeLog
index e1f9f401..0582a530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-11-04  Hrvoje Niksic  <hniksic@xemacs.org>
 
+	* configure.in: Use the new form of AC_OUTPUT.
+
 	* Makefile.cvs (prep): Invoke autoheader.
 
 2003-11-04  Hrvoje Niksic  <hniksic@xemacs.org>
diff --git a/configure.in b/configure.in
index 46b4412d..98c15f7d 100644
--- a/configure.in
+++ b/configure.in
@@ -587,7 +587,8 @@ AC_SUBST(COMMENT_IF_NO_POD2MAN)
 dnl
 dnl Create output
 dnl
-AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in
-           windows/Makefile],
-[WGET_PROCESS_PO
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
+                 po/Makefile.in windows/Makefile])
+AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO])
+AC_OUTPUT