diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..07740ced
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,39 @@
+# editorconfig.org
+
+root = true
+
+[*]
+# Unix style files
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.css]
+indent_style = tab
+indent_size = 4
+
+[*.js]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.{htm,html}]
+indent_style = tab
+indent_size = 4
+
+[*.{md,markdown}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[.travis.yml]
+indent_style = space
+indent_size = 4