diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index 0214ac5fc4..b4a5ad0f95 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -440,7 +440,8 @@ Note that these flags should only appear after a command.
     Display the file or directory used to cache <formula>.
 
   * `--cellar`:
-    Display Homebrew's Cellar path. *Default:* `/usr/local/Cellar`
+    Display Homebrew's Cellar path. *Default:* `$(brew --prefix)/Cellar`, or if
+    that directory doesn't exist, `$(brew --repository)/Cellar`.
 
   * `--cellar` <formula>:
     Display the location in the cellar where <formula> would be installed,
diff --git a/share/doc/homebrew/External-Commands.md b/share/doc/homebrew/External-Commands.md
index 20533ee469..4166300cf0 100644
--- a/share/doc/homebrew/External-Commands.md
+++ b/share/doc/homebrew/External-Commands.md
@@ -31,7 +31,7 @@ A shell script for an command named `extcmd` should be named `brew-extcmd`. This
 	</tr>
   <tr>
     <td>HOMEBREW_CELLAR</td>
-		<td>The location of the Homebrew Cellar, where software is staged, by default <code>/usr/local/Cellar</code>.</td>
+		<td>The location of the Homebrew Cellar, where software is staged. This will be <code>$HOMEBREW_PREFIX/Cellar</code> if that directory exists, or <code>$HOMEBREW_REPOSITORY/Cellar</code> otherwise.</td>
   </tr>
   <tr>
     <td>HOMEBREW_LIBRARY_PATH</td>
@@ -39,7 +39,7 @@ A shell script for an command named `extcmd` should be named `brew-extcmd`. This
 	</tr>
   <tr>
     <td>HOMEBREW_PREFIX</td>
-		<td>Where Homebrew installs software to, by default <code>/usr/local</code>.</td>
+		<td>Where Homebrew installs software. This is always the grandparent directory of the `brew` executable, <code>/usr/local</code> by default.</td>
 	</tr>
   <tr>
     <td>HOMEBREW_REPOSITORY</td>