diff --git a/src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php b/src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php
index 52e27208c7..1c2fa71550 100644
--- a/src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php
+++ b/src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php
@@ -46,7 +46,7 @@ class PhabricatorIRCObjectNameHandler extends PhabricatorIRCHandler {
         $pattern =
           '@'.
           '(?<!/)(?:^|\b)'. // Negative lookbehind prevent matching "/D123".
-          '(D|T|P|V)(\d+)'.
+          '(D|T|P|V|F)(\d+)'.
           '(?:\b|$)'.
           '@';
 
@@ -55,6 +55,7 @@ class PhabricatorIRCObjectNameHandler extends PhabricatorIRCHandler {
         $paste_ids = array();
         $commit_names = array();
         $vote_ids = array();
+        $file_ids = array();
 
         if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
           foreach ($matches as $match) {
@@ -71,6 +72,9 @@ class PhabricatorIRCObjectNameHandler extends PhabricatorIRCHandler {
               case 'V':
                  $vote_ids[] = $match[2];
                  break;
+              case 'F':
+                 $file_ids[] = $match[2];
+                 break;
             }
           }
         }
@@ -126,6 +130,18 @@ class PhabricatorIRCObjectNameHandler extends PhabricatorIRCHandler {
               ' Come Vote '.$vote['uri'];
          }
        }
+       
+       if ($file_ids) {
+         foreach ($file_ids as $file_id) {
+           $file = $this->getConduit()->callMethodSynchronous(
+             'file.info',
+             array(
+               'id' => $file_id,
+           ));
+           $output[$file['phid']] = $file['objectName'].": ".$file['uri']." - ".
+              $file['name'];
+         }
+       }
 
         if ($paste_ids) {
           foreach ($paste_ids as $paste_id) {