diff --git a/ChangeLog b/ChangeLog
index 1d7523be..185bb859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (emacs_local_vars_begin)
+	(emacs_local_vars_read_only, emacs_local_vars_end): New.
+
 2010-01-22  Werner Koch  <wk@g10code.com>
 
 	* autogen.sh (--build-w32): Add --with-libassuan-prefix.
diff --git a/configure.ac b/configure.ac
index 5fb09d46..9b3b0d43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -871,6 +871,12 @@ AC_CHECK_TYPES([error_t], [],
    [#include <errno.h>])
 
 
+# A substitution to set generated files in a Emacs buffer to read-only.
+AC_SUBST(emacs_local_vars_begin, ['Local Variables:'])
+AC_SUBST(emacs_local_vars_read_only, ['buffer-read-only: t'])
+AC_SUBST(emacs_local_vars_end, ['End:'])
+
+
 # Last check.
 die=no
 if test "$require_libassuan" = "no"; then
diff --git a/src/ChangeLog b/src/ChangeLog
index 3cdd9aae..7be7b5f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Werner Koch  <wk@g10code.com>
+
+	* gpgme.h.in: Add autoconf template to set generated file to
+	read-only in an emacs buffer.
+
 2010-03-12  Werner Koch  <wk@g10code.com>
 
 	* gpgme.h.in (GPGME_STATUS_SUCCESS): Use the right file for the
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 59ee77bf..2c5ef108 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -2101,3 +2101,8 @@ typedef gpgme_status_code_t GpgmeStatusCode _GPGME_DEPRECATED;
 }
 #endif
 #endif /* GPGME_H */
+/*
+@emacs_local_vars_begin@
+@emacs_local_vars_read_only@
+@emacs_local_vars_end@
+*/