diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index 3faa67051b..e04c47e369 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -52,7 +52,7 @@ Thanks, you're awesome :-) -->
 
 * Added a notice highlighting that the `tracing` fields are not nested under the
   namespace `tracing.` #1162
-* ES 6.x template data types will fallback to supported types. #1171
+* ES 6.x template data types will fallback to supported types. #1171, #1176
 
 #### Deprecated
 
diff --git a/scripts/generators/es_template.py b/scripts/generators/es_template.py
index bb56356a5a..65dc871a2e 100644
--- a/scripts/generators/es_template.py
+++ b/scripts/generators/es_template.py
@@ -97,6 +97,13 @@ def generate_template_version(elasticsearch_version, mappings_section, out_dir,
     if elasticsearch_version == 6:
         es6_mappings_section = copy.deepcopy(mappings_section)
         es6_type_fallback(es6_mappings_section['properties'])
+
+        # error.stack_trace needs special handling to set
+        # index: false and doc_values: false
+        error_stack_trace_mappings = es6_mappings_section['properties']['error']['properties']['stack_trace']
+        error_stack_trace_mappings.setdefault('index', False)
+        error_stack_trace_mappings.setdefault('doc_values', False)
+
         template['mappings'] = {'_doc': es6_mappings_section}
     else:
         template['mappings'] = mappings_section