diff --git a/ChangeLog b/ChangeLog
index a9069f97..22348509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-17  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Disable AC_CONFIG_MACRO_DIR for now.
+
 2004-09-14  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac: Improve diagnostics with version check.
diff --git a/configure.ac b/configure.ac
index d19c2a40..82bfd96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,8 @@ PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
 AC_CONFIG_SRCDIR(gpgme/gpgme.h)
-AC_CONFIG_MACRO_DIR(m4)
+dnl FIXME: Enable this with autoconf 2.59.
+dnl AC_CONFIG_MACRO_DIR(m4)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_MAINTAINER_MODE