diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..6d37aabc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root                     = true
+[*]
+indent_style             = space
+indent_size              = 4
+end_of_line              = lf
+charset                  = utf-8
+trim_trailing_whitespace = true
+insert_final_newline     = true
+
+[*.go]
+indent_size = 4
+indent_style = tab
+
+[Makefile]
+indent_style = tab
\ No newline at end of file