diff --git a/conf/default.conf.php b/conf/default.conf.php
index 32f56bd8d5..b153eb142c 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -22,6 +22,11 @@ return array(
   // Example: "http://phabricator.example.com/"
   'phabricator.base-uri'        => null,
 
+  // If you have multiple environments, provide the production environment URI
+  // here so that emails, etc., generated in development/sandbox environments
+  // contain the right links.
+  'phabricator.production-uri'  => null,
+
   // The default PHID for users who haven't uploaded a profile image. It should
   // be 50x50px.
   'user.default-profile-image-phid' => 'PHID-FILE-f57aaefce707fc4060ef',
diff --git a/src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php
index f5cf7b3284..fd53cf0be9 100644
--- a/src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php
+++ b/src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php
@@ -80,9 +80,9 @@ class PhabricatorRepositoryCommitHeraldWorker
 
     $description = $data->getCommitMessage();
 
-    $details = PhabricatorEnv::getURI('/'.$commit_name);
+    $details = PhabricatorEnv::getProductionURI('/'.$commit_name);
     $differential = $revision
-      ? PhabricatorEnv::getURI('/D'.$revision->getID())
+      ? PhabricatorEnv::getProductionURI('/D'.$revision->getID())
       : 'No revision.';
 
     $files = $adapter->loadAffectedPaths();
@@ -91,8 +91,9 @@ class PhabricatorRepositoryCommitHeraldWorker
 
     $xscript_id = $xscript->getID();
 
-    $manage_uri = PhabricatorEnv::getURI('/herald/view/commits/');
-    $why_uri = PhabricatorEnv::getURI('/herald/transcript/'.$xscript_id.'/');
+    $manage_uri = PhabricatorEnv::getProductionURI('/herald/view/commits/');
+    $why_uri = PhabricatorEnv::getProductionURI(
+      '/herald/transcript/'.$xscript_id.'/');
 
     $body = <<<EOBODY
 DESCRIPTION
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index c349913b5c..54fdc3d64f 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -31,6 +31,14 @@ final class PhabricatorEnv {
     return rtrim(self::getEnvConfig('phabricator.base-uri'), '/').$path;
   }
 
+  public static function getProductionURI($path) {
+    $uri = self::getEnvConfig('phabricator.production-uri');
+    if (!$uri) {
+      $uri = self::getEnvConfig('phabricator.base-uri');
+    }
+    return rtrim($uri, '/').$path;
+  }
+
   public static function getAllConfigKeys() {
     return self::$env;
   }