diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index c3aeb937ea..93e8c03ece 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -227,10 +227,9 @@ COMMANDS                                                         *go-commands*
                                                                   *:GoImports*
 :GoImports
 
-    Filter the current Go buffer through goimports (needs to be installed).
-    `goimports` automatically discards/add import path based on the code. Like
-    |:GoFmt|, It tries to preserve cursor position and avoids replacing the
-    buffer with stderr output.
+    Adjust imports using the setting of `g:go_imports_mode`. Like |:GoFmt|, It
+    tries to preserve cursor position and avoids replacing the buffer with
+    stderr output.
 
                                                                      *:GoPlay*
 :[range]GoPlay
@@ -935,7 +934,7 @@ documentation in the |go-commands| section. Available <Plug> keys are:
 
                                                                     *(go-run)*
 
-Calls `go run` for the current main package
+Calls `go run` for the current main package.
 
                                                                 *(go-run-tab)*
 
@@ -954,23 +953,23 @@ This option is neovim only.
 
                                                                   *(go-build)*
 
-Calls `go build` for the current package
+Calls `go build` for the current package.
 
                                                                *(go-generate)*
 
-Calls `go generate` for the current package
+Calls `go generate` for the current package.
 
                                                                    *(go-info)*
 
-Shows type information for the word under the cursor
+Shows type information for the word under the cursor.
 
                                                                 *(go-install)*
 
-Calls `go install` for the current package
+Calls `go install` for the current package.
 
                                                                    *(go-test)*
 
-Calls `go test` for the current package
+Calls `go test` for the current package.
 
                                                               *(go-test-func)*
 
@@ -978,7 +977,7 @@ Calls `go test -run '...'` for the test function immediate to cursor
 
                                                            *(go-test-compile)*
 
-Calls `go test -c` for the current package
+Calls `go test -c` for the current package.
 
                                                                *(go-coverage)*
 
@@ -987,7 +986,7 @@ coverage annotation.
 
                                                          *(go-coverage-clear)*
 
-Clears the coverage annotation
+Clears the coverage annotation.
 
                                                         *(go-coverage-toggle)*
 
@@ -995,27 +994,30 @@ Calls `go test -coverprofile-temp.out` for the current package and shows the
 coverage annotation. If run again it acts as a toggle and clears the
 annotation.
 
+                                                                    *(go-fmt)*
+
+Format the current buffer.
                                                                 *(go-imports)*
 
-Calls `goimports` for the current package
+Adjust imports for the current buffer.
 
                                                                    *(go-lint)*
 
-Calls `golint` for the current package
+Calls `golint` for the current package.
 
                                                                     *(go-vet)*
 
-Calls `go vet` for the current package
+Calls `go vet` for the current package.
 
 
                                                                   *(go-files)*
 
-Show source files that depends for the current package
+Show source files that depends for the current package.
 
 
                                                                    *(go-deps)*
 
-Show dependencies for the current package
+Show dependencies for the current package.
 
                                                                     *(go-doc)*
 
diff --git a/ftplugin/go/commands.vim b/ftplugin/go/commands.vim
index 8713f6a3e6..8b1ca98e9c 100644
--- a/ftplugin/go/commands.vim
+++ b/ftplugin/go/commands.vim
@@ -70,7 +70,7 @@ command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#
 command! -nargs=* -range -complete=customlist,go#package#Complete GoDocBrowser call go#doc#OpenBrowser(<f-args>)
 
 " -- fmt
-command! -nargs=0 GoFmt call go#fmt#Format(-1)
+command! -nargs=0 GoFmt call go#fmt#Format(0)
 command! -nargs=0 GoFmtAutoSaveToggle call go#fmt#ToggleFmtAutoSave()
 command! -nargs=0 GoImports call go#fmt#Format(1)
 
diff --git a/ftplugin/go/mappings.vim b/ftplugin/go/mappings.vim
index c7a0d5c22d..ea8fdf5aa6 100644
--- a/ftplugin/go/mappings.vim
+++ b/ftplugin/go/mappings.vim
@@ -34,6 +34,7 @@ nnoremap <silent> <Plug>(go-deps) :<C-u>call go#tool#Deps()<CR>
 nnoremap <silent> <Plug>(go-info) :<C-u>call go#tool#Info(1)<CR>
 nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', expand('<cword>'), '')<CR>
 nnoremap <silent> <Plug>(go-imports) :<C-u>call go#fmt#Format(1)<CR>
+nnoremap <silent> <Plug>(go-fmt) :<C-u>call go#fmt#Format(0)<CR>
 
 nnoremap <silent> <Plug>(go-implements) :<C-u>call go#implements#Implements(-1)<CR>
 nnoremap <silent> <Plug>(go-callees) :<C-u>call go#guru#Callees(-1)<CR>