diff --git a/ChangeLog b/ChangeLog
index e79b51741..68c51cc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-08  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do
+	per-target builds (like we do in the keyserver dir), but exists in
+	the currently-used 1.9.3 as well.
+
 2007-06-13  David Shaw  <dshaw@jabberwocky.com>
 
 	* configure.ac: Add --enable-camellia.  Disabled by default.  Do
diff --git a/configure.ac b/configure.ac
index a31ddd628..02f82d78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,6 +508,7 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, :)