diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..cfb5d4f8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+charset = utf-8
+end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 4
+
+[*.md]
+max_line_length = 120
+trim_trailing_whitespace = false
+
+[Makefile,Makefile.dist,*.mk]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index 8f1dee86..339ecb89 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
+.editorconfig      export-ignore
 /.gitattributes    export-ignore
 /docs              export-ignore