diff --git a/.editorconfig b/.editorconfig
index 8091a1f57..8ae10ed94 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,12 +12,14 @@ insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
 
-# Don't change test output files, pngs or test data files
-[*.{out,png,data}]
+# Don't change test outputs, data files, C files, markdowns and generated files
+[{*.{out,png,data,md,guess,c,h,lock},LICENSE,configure}]
 insert_final_newline = unset
 trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
 
-[*.{sql,sh,py}]
+[*.{sql,sh,py,spec,json,source}]
 indent_style = space
 indent_size = 4
 tab_width = 4
diff --git a/src/backend/columnar/sql/.editorconfig b/src/backend/columnar/sql/.editorconfig
new file mode 100644
index 000000000..539be5fe7
--- /dev/null
+++ b/src/backend/columnar/sql/.editorconfig
@@ -0,0 +1,2 @@
+# do not use any .editorconfig files in upper level dir
+root = true
diff --git a/src/backend/distributed/sql/.editorconfig b/src/backend/distributed/sql/.editorconfig
new file mode 100644
index 000000000..539be5fe7
--- /dev/null
+++ b/src/backend/distributed/sql/.editorconfig
@@ -0,0 +1,2 @@
+# do not use any .editorconfig files in upper level dir
+root = true
diff --git a/src/include/.editorconfig b/src/include/.editorconfig
new file mode 100644
index 000000000..2bb649e4d
--- /dev/null
+++ b/src/include/.editorconfig
@@ -0,0 +1,6 @@
+# Don't change generated input file
+[citus_config.h.in]
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
diff --git a/src/test/regress/mitmscripts/.editorconfig b/src/test/regress/mitmscripts/.editorconfig
new file mode 100644
index 000000000..539be5fe7
--- /dev/null
+++ b/src/test/regress/mitmscripts/.editorconfig
@@ -0,0 +1,2 @@
+# do not use any .editorconfig files in upper level dir
+root = true
diff --git a/src/test/regress/sql/.editorconfig b/src/test/regress/sql/.editorconfig
new file mode 100644
index 000000000..539be5fe7
--- /dev/null
+++ b/src/test/regress/sql/.editorconfig
@@ -0,0 +1,2 @@
+# do not use any .editorconfig files in upper level dir
+root = true
diff --git a/vendor/.editorconfig b/vendor/.editorconfig
new file mode 100644
index 000000000..539be5fe7
--- /dev/null
+++ b/vendor/.editorconfig
@@ -0,0 +1,2 @@
+# do not use any .editorconfig files in upper level dir
+root = true