diff --git a/configure.ac b/configure.ac
index ee4143a5b..a19c7ca9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -643,16 +643,16 @@ struct sockaddr_storage;
 #define UNBOUND_ALLOC_STATS
 #ifdef UNBOUND_ALLOC_STATS
 #  ifdef malloc
-#    undef malloc
+#    undef malloc	/* keepoff autoheader */
 #  endif
 #  ifdef realloc
-#    undef realloc
+#    undef realloc	/* keepoff autoheader */
 #  endif
 #  ifdef calloc
-#    undef calloc
+#    undef calloc	/* keepoff autoheader */
 #  endif
 #  ifdef free
-#    undef free
+#    undef free	/* keepoff autoheader */
 #  endif
 
 #if 0
diff --git a/doc/Changelog b/doc/Changelog
index 7a6e05e9f..80d913718 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
 	- outbound entries are allocated in the query region they are for.
 	- extensive debugging for memory allocations.
 	- --enable-lock-checks can be used to enable lock checking.
+	- protect undefs in config.h from autoheaders ministrations.
 
 13 August 2007: Wouter
 	- fixup makefile, if lexer is missing give nice error and do not