diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..b3dfee7
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 14e7b61..0cfc828 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,8 @@ coverage
 dist
 *.log
 .*
+!.babelrc
+!.editorconfig
 !.gitignore
 !.npmignore
-!.babelrc
 !.travis.yml