diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..01c6f12
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+
+[.travis.yml]
+indent_style = space
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 8277603..ed7c766 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+* text=auto
+
+.editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore