diff --git a/common/ChangeLog b/common/ChangeLog
index ab9a59fbc..19ccd79e9 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (audit-events.h, status.h) [!MAINTAINER_MODE]: No
+	longer include these rules if not in maintainer mode.
+
 2009-12-08  Werner Koch  <wk@g10code.com>
 
 	* userids.h, userids.c: New.
diff --git a/common/Makefile.am b/common/Makefile.am
index d5446ddd2..c7a9f09ba 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -97,6 +97,10 @@ libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 libgpgrl_a_SOURCES = \
         gpgrlhelp.c
 
+if MAINTAINER_MODE
+# Note: Due to the dependency on Makefile, the file will always be
+# rebuilt, so we allow this only in maintainer mode.
+
 # Create the audit-events.h include file from audit.h
 # Note: We create the target file in the source directory because it
 # is a distributed built source.  If we would not do that we may end
@@ -112,7 +116,7 @@ status-codes.h: Makefile mkstrtable.awk exstatus.awk status.h
 	$(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
 	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
 		   -v namespace=statusstr_  > $(srcdir)/$@
-
+endif
 
 #
 # Module tests