diff --git a/.editorconfig b/.editorconfig
index 910ceec..1d0d5cb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +1,19 @@
+# top-most EditorConfig file
 root = true
 
 [**]
 charset = utf-8
 end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
 max_line_length = 80
+trim_trailing_whitespace = true
 
-# Set default charset and indentation for python files
-[{setup.py,tests/**/*.py,coala-quickstart/**/*.py}]
-indent_style = space
+# Set default indentation for python files
+[*.py]
 indent_size = 4
-trim_trailing_whitespace = true
 
-# 2 space indentation for yml fies 
-[{*.yml}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
+# Override trailing whitespace for markdown files
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.moban.yaml b/.moban.yaml
index 01912a9..cdf355c 100644
--- a/.moban.yaml
+++ b/.moban.yaml
@@ -42,6 +42,7 @@ configuration:
   configuration_dir: ../coala-mobans/
 targets:
   - .gitignore: coala-gitignore.jj2
+  - .editorconfig: .editorconfig.jj2
   - setup.py: coala-setup.py.jj2
   - setup.cfg: setup.cfg.jj2
   - requirements.txt: requirements.txt.jj2