diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c0d9f67ad8..139b656f33e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-12  Tom de Vries  <tom@codesourcery.com>
+
+	* gen-pass-instances.awk: Add emacs indent setting.
+
 2015-11-12  Naveen H.S  <Naveen.Hurugalawadi@caviumnetworks.com>
 
 	* fold-const.c (fold_binary_loc) : Move Convert A/B/C to A/(B*C)
diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk
index f36f510124d..a0be6a1002c 100644
--- a/gcc/gen-pass-instances.awk
+++ b/gcc/gen-pass-instances.awk
@@ -64,3 +64,8 @@ function handle_line()
 }
 
 { handle_line() }
+
+# Local Variables:
+# mode:awk
+# c-basic-offset:8
+# End: