diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..9a80d2d5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+max_line_length = 99
+
+[*.{yml, yaml}]
+indent_style = space
+indent_size = 2
+
+[*.{md,txt}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/CHANGES/650.misc b/CHANGES/650.misc
new file mode 100644
index 00000000..513270ef
--- /dev/null
+++ b/CHANGES/650.misc
@@ -0,0 +1 @@
+Added `.editorconfig`