diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 68fbaf1..9057931 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -74,6 +74,13 @@ augroup mediawiki
     autocmd BufRead,BufNewFile *.wikipedia.org* setfiletype mediawiki
 augroup END
 
+augroup go
+  autocmd FileType go set ts=2
+  autocmd FileType go set softtabstop=2
+  autocmd FileType go set shiftwidth=2
+  autocmd FileType go set noexpandtab
+augroup END
+
 autocmd FileType go let b:auto_trim_whitespace=1
 autocmd FileType cpp let b:auto_trim_whitespace=1
 autocmd FileType perl let b:auto_trim_whitespace=1