diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..72823b8e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+endofline = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
index 91c01561..a319be88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ dist
 *.iml
 *.sublime-project
 *.sublime-workspace
-.editorconfig