diff --git a/README.md b/README.md
index 69965d8..9a02b8d 100644
--- a/README.md
+++ b/README.md
@@ -42,5 +42,5 @@ Extensions | Tools
 .a .so | [nm](https://linux.die.net/man/1/nm)
 .png .jpg .gif .bmp .ppm .tiff .tga | [pil](http://python-pillow.github.io/) • [pil_half](http://python-pillow.github.io/)
 .bash .sh .dash .ksh | [shellcheck](http://hackage.haskell.org/package/ShellCheck)
-.go | [gofmt](https://golang.org) • [go_vet](https://golang.org) • [godoc](http://golang.org/x/tools)
+.go | [gofmt](https://golang.org) • [go_vet](https://golang.org) • [golint](https://github.com/golang/lint) • [godoc](http://golang.org/x/tools)
 .yaml | [yamllint](https://github.com/adrienverge/yamllint)
diff --git a/vigil/tools.toml b/vigil/tools.toml
index b769354..156674c 100644
--- a/vigil/tools.toml
+++ b/vigil/tools.toml
@@ -20,7 +20,7 @@ tools_for_extensions = [
    [["a", "so"], ["nm"]],
    [["png", "jpg", "gif", "bmp", "ppm", "tiff", "tga"], ["pil", "pil_half"]],
    [["bash", "sh", "dash", "ksh"], ["shellcheck"]],
-   [["go"], ["gofmt", "go_vet", "godoc"]],
+   [["go"], ["gofmt", "go_vet", "golint", "godoc"]],
    [["yaml"], ["yamllint"]]]
 
 
@@ -123,6 +123,12 @@ tools_for_extensions = [
   command = "go vet"
   error_status = "normal"
 
+[golint]
+  dependencies = ["golint"]
+  url = "golint"
+  command = "golint -set_exit_status"
+  error_status = "normal"
+
 [yamllint]
   dependencies = ["yamllint"]
   url = "yamllint"