diff --git a/Phabricator/plugin.py b/Phabricator/plugin.py
--- a/Phabricator/plugin.py
+++ b/Phabricator/plugin.py
@@ -221,6 +221,7 @@
          |(?<![:])\b # word boundary, not preceded by ":"
         )
         [A-Z]\d+
+        (#\d+|#\d+[-A-Za-z0-0]+)      # optional comment
         (?:
           $         # end of line
          |\b        # word boundary