diff --git a/src/applications/diffusion/request/base/DiffusionRequest.php b/src/applications/diffusion/request/base/DiffusionRequest.php
index c10146a981..5d4d0cafd8 100644
--- a/src/applications/diffusion/request/base/DiffusionRequest.php
+++ b/src/applications/diffusion/request/base/DiffusionRequest.php
@@ -351,6 +351,7 @@ abstract class DiffusionRequest {
     $path = "{$branch}{$path}";
 
     if (strlen($commit)) {
+      $commit = str_replace('$', '$$', $commit);
       $commit = ';'.phutil_escape_uri($commit);
     }
 
@@ -471,20 +472,30 @@ abstract class DiffusionRequest {
     // Consume the back part of the URI, up to the first "$". Use a negative
     // lookbehind to prevent matching '$$'. We double the '$' symbol when
     // encoding so that files with names like "money/$100" will survive.
-    if (preg_match('@(?<![$])[$]([\d-]+)$@', $blob, $matches)) {
+    $pattern = '@(?:(?:^|[^$])(?:[$][$])*)[$]([\d-]+)$@';
+    if (preg_match($pattern, $blob, $matches)) {
       $result['line'] = $matches[1];
       $blob = substr($blob, 0, -(strlen($matches[1]) + 1));
     }
 
-    // Consume the commit name, stopping on ';;'.
-    if (preg_match('@(?<!;);([a-z0-9]+)$@', $blob, $matches)) {
+    // We've consumed the line number if it exists, so unescape "$" in the
+    // rest of the string.
+    $blob = str_replace('$$', '$', $blob);
+
+    // Consume the commit name, stopping on ';;'. We allow any character to
+    // appear in commits names, as they can sometimes be symbolic names (like
+    // tag names or refs).
+    if (preg_match('@(?:(?:^|[^;])(?:;;)*);([^;].*)$@', $blob, $matches)) {
       $result['commit'] = $matches[1];
       $blob = substr($blob, 0, -(strlen($matches[1]) + 1));
     }
 
-    // Un-double our delimiter characters.
+    // We've consumed the commit if it exists, so unescape ";" in the rest
+    // of the string.
+    $blob = str_replace(';;', ';', $blob);
+
     if (strlen($blob)) {
-      $result['path'] = str_replace(array(';;', '$$'), array(';', '$'), $blob);
+      $result['path'] = $blob;
     }
 
     $parts = explode('/', $result['path']);
diff --git a/src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php b/src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php
index 14d3e8040c..84e18a3d33 100644
--- a/src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php
+++ b/src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php
@@ -39,6 +39,22 @@ final class DiffusionURITestCase extends ArcanistPhutilTestCase {
       'a%252Fb/' => array(
         'branch'  => 'a/b',
       ),
+      'branch/path/;Version-1_0_0' => array(
+        'branch' => 'branch',
+        'path'   => 'path/',
+        'commit' => 'Version-1_0_0',
+      ),
+      'branch/path/;$$moneytag$$' => array(
+        'branch' => 'branch',
+        'path'   => 'path/',
+        'commit' => '$moneytag$',
+      ),
+      'branch/path/semicolon;;;;;$$;;semicolon;;$$$$$100' => array(
+        'branch' => 'branch',
+        'path'   => 'path/semicolon;;',
+        'commit' => '$;;semicolon;;$$',
+        'line'   => '100',
+      ),
     );
 
     foreach ($map as $input => $expect) {
diff --git a/src/applications/diffusion/view/taglist/DiffusionTagListView.php b/src/applications/diffusion/view/taglist/DiffusionTagListView.php
index b26c147050..080f4a841d 100644
--- a/src/applications/diffusion/view/taglist/DiffusionTagListView.php
+++ b/src/applications/diffusion/view/taglist/DiffusionTagListView.php
@@ -62,7 +62,7 @@ final class DiffusionTagListView extends DiffusionView {
           'href' => $drequest->generateURI(
             array(
               'action' => 'browse',
-              'commit' => $tag->getCommitIdentifier(),
+              'commit' => $tag->getName(),
             )),
         ),
         phutil_escape_html($tag->getName()));