diff --git a/.editorconfig b/.editorconfig
index 5760be58369..831bb8696cc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,13 @@
 # http://editorconfig.org
 root = true
 
+[*.go]
+indent_style = tabs
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 [*]
 indent_style = space
 indent_size = 2