diff --git a/.gitignore b/.gitignore
index 0f082f5290..1e4d864013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 .DS_Store
 # a .bashrc may be added to customize the build environment
 .bashrc
+.editorconfig
 .gopath/
 .go-pkg-cache/
 autogen/
diff --git a/contrib/editorconfig b/contrib/editorconfig
new file mode 100644
index 0000000000..97eda89a4b
--- /dev/null
+++ b/contrib/editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+indent_size = 2
+indent_style = space