diff --git a/README.md b/README.md
index 20340d8..69965d8 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,4 @@ Extensions | Tools
 .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)
+.yaml | [yamllint](https://github.com/adrienverge/yamllint)
diff --git a/vigil/tools.toml b/vigil/tools.toml
index 52b7c24..b769354 100644
--- a/vigil/tools.toml
+++ b/vigil/tools.toml
@@ -20,7 +20,8 @@ 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", "godoc"]],
+   [["yaml"], ["yamllint"]]]
 
 
 # Tool template:
@@ -121,3 +122,8 @@ tools_for_extensions = [
   url = "golang-go"
   command = "go vet"
   error_status = "normal"
+
+[yamllint]
+  dependencies = ["yamllint"]
+  url = "yamllint"
+  command = "yamllint"