diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index 998e277ff3..a77f0f7e86 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -355,6 +355,18 @@ Note that these flags should only appear after a command.
   * `tap --repair`:
     Migrate tapped formulae from symlink-based to directory-based structure.
 
+  * `tap-info` <tap>:
+    Display information about <tap>.
+
+  * `tap-info --json=<version>` (--installed|<taps>):
+    Print a JSON representation of <taps>. Currently the only accepted value
+    for <version> is `v1`.
+
+    Pass `--installed` to get information on installed taps.
+
+    See the docs for examples of using the JSON:
+    <https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Querying-Brew.md>
+
   * `test` [--devel|--HEAD] [--debug] <formula>:
     A few formulae provide a test method. `brew test <formula>` runs this
     test method. There is no standard output or return code, but it should
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 7816904ab6..305a41d209 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -383,6 +383,20 @@ If \fB\-\-full\fR is passed, a full clone will be used\.
 Migrate tapped formulae from symlink\-based to directory\-based structure\.
 .
 .TP
+\fBtap\-info\fR \fItap\fR
+Display information about \fItap\fR\.
+.
+.TP
+\fBtap\-info \-\-json=<version>\fR (\-\-installed|\fItaps\fR)
+Print a JSON representation of \fItaps\fR\. Currently the only accepted value for \fIversion\fR is \fBv1\fR\.
+.
+.IP
+Pass \fB\-\-installed\fR to get information on installed taps\.
+.
+.IP
+See the docs for examples of using the JSON: \fIhttps://github\.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Querying\-Brew\.md\fR
+.
+.TP
 \fBtest\fR [\-\-devel|\-\-HEAD] [\-\-debug] \fIformula\fR
 A few formulae provide a test method\. \fBbrew test <formula>\fR runs this test method\. There is no standard output or return code, but it should generally indicate to the user if something is wrong with the installed formula\.
 .