diff --git a/README.md b/README.md
index 7d71cfd..479db44 100644
--- a/README.md
+++ b/README.md
@@ -44,3 +44,4 @@ Extensions | Tools
 .bash .sh .dash .ksh | [shellcheck](http://hackage.haskell.org/package/ShellCheck)
 .go | [gofmt](https://golang.org) • [go_vet](https://golang.org) • [golint](https://github.com/golang/lint) • [godoc](http://golang.org/x/tools)
 .yaml .yml | [yamllint](https://github.com/adrienverge/yamllint)
+.md | [pandoc_md](https://pandoc.org/)
diff --git a/vigil/tools.toml b/vigil/tools.toml
index 838e74d..52f848f 100644
--- a/vigil/tools.toml
+++ b/vigil/tools.toml
@@ -21,7 +21,8 @@ tools_for_extensions = [
    [["png", "jpg", "gif", "bmp", "ppm", "tiff", "tga"], ["pil", "pil_half"]],
    [["bash", "sh", "dash", "ksh"], ["shellcheck"]],
    [["go"], ["gofmt", "go_vet", "golint", "godoc"]],
-   [["yaml", "yml"], ["yamllint"]]]
+   [["yaml", "yml"], ["yamllint"]],
+   [["md"], ["pandoc_md"]]]
 
 
 # Tool template:
@@ -133,3 +134,9 @@ tools_for_extensions = [
   dependencies = ["yamllint"]
   url = "yamllint"
   command = "yamllint"
+
+[pandoc_md]
+  dependencies = ["pandoc"]
+  url = "pandoc"
+  command = "pandoc -f markdown -t plain"
+  success_status = "normal"