diff --git a/bundles.vim b/bundles.vim
index 2c22b82..cddb86b 100644
--- a/bundles.vim
+++ b/bundles.vim
@@ -33,7 +33,7 @@ Bundle 'scrooloose/syntastic'
 
 Bundle 'kchmck/vim-coffee-script'
 Bundle 'vim-scripts/glsl.vim'
-Bundle 'jnwhiteh/vim-golang'
+Bundle 'fatih/vim-go'
 Bundle 'groenewege/vim-less'
 "Bundle 'gkz/vim-ls'
 Bundle 'tpope/vim-markdown'
diff --git a/vimrc b/vimrc
index 6fcedb4..f2799f5 100644
--- a/vimrc
+++ b/vimrc
@@ -111,7 +111,7 @@ set list
 "OS clipboard integration
 set clipboard^=unnamed
 
-"filetype specific settings
+"filetype/language specific settings
 autocmd FileType make    set noexpandtab   "makefiles need tabs
 autocmd FileType ruby    set softtabstop=2 shiftwidth=2
 autocmd FileType eruby   set softtabstop=2 shiftwidth=2
@@ -120,6 +120,7 @@ au      BufRead,BufNewFile Guardfile setfiletype ruby
 au      BufRead,BufNewFile *.skim setfiletype slim
 au      BufRead,BufNewFile *.opal setfiletype ruby
 let g:syntastic_ruby_checkers = ['mri', 'rubocop']
+let g:go_fmt_command = "goimports"
 
 if expand('%:t') =~? 'rfc\d\+' || expand('%:t') =~? 'draft-.*-\d\{2,}'
     setfiletype rfc