diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 28530e1..ec300c5 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -81,6 +81,8 @@ augroup go
   autocmd FileType go set softtabstop=2
   autocmd FileType go set shiftwidth=2
   autocmd FileType go set noexpandtab
+  autocmd FileType go nmap <Leader>gd <Plug>(go-doc)
+  autocmd FileType go nmap gd <Plug>(go-def)
 augroup END
 
 autocmd FileType go let b:auto_trim_whitespace=1
diff --git a/.vimrc b/.vimrc
index 1be1d73..3d2baaf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -119,6 +119,7 @@ Bundle 'honza/vim-snippets'
 Plugin 'JuliaLang/julia-vim'
 Plugin 'tpope/vim-surround'
 Bundle 'farseer90718/vim-taskwarrior'
+Bundle 'fatih/vim-go'
 "https://git.wincent.com/command-t.git
 call vundle#end()
 filetype plugin indent on    " required