diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..ae72bae0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+# See http://editorconfig.org
+
+# In Go files we indent with tabs but still 
+# set indent_size to control the GitHub web viewer.  
+[*.go]
+indent_size=4
+