diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..8f166651e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.go]
+ident_style = space
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab