diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index ca7c078204..3af4efb2e5 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -778,9 +778,9 @@ final class DiffusionCommitController extends DiffusionController {
         'dynamic' => array(
           'add-auditors-tokenizer' => array(
             'actions' => array('add_auditors' => 1),
-            'src' => '/typeahead/common/usersorprojects/',
+            'src' => '/typeahead/common/usersprojectsorpackages/',
             'row' => 'add-auditors',
-            'placeholder' => pht('Type a user or project name...'),
+            'placeholder' => pht('Type a user, project, or package name...'),
           ),
           'add-ccs-tokenizer' => array(
             'actions' => array('add_ccs' => 1),
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
index 78f2c9ee8a..ad3e45ffb9 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
@@ -73,6 +73,11 @@ final class PhabricatorTypeaheadCommonDatasourceController
         $need_users = true;
         $need_projs = true;
         break;
+      case 'usersprojectsorpackages':
+        $need_users = true;
+        $need_projs = true;
+        $need_packages = true;
+        break;
       case 'repositories':
         $need_repos = true;
         break;
@@ -309,6 +314,7 @@ final class PhabricatorTypeaheadCommonDatasourceController
       $packages = id(new PhabricatorOwnersPackage())->loadAll();
       foreach ($packages as $package) {
         $results[] = id(new PhabricatorTypeaheadResult())
+          ->setIcon('pl-testplan')
           ->setName($package->getName())
           ->setURI('/owners/package/'.$package->getID().'/')
           ->setPHID($package->getPHID());
diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
index ae658d51b4..8c706cca41 100644
--- a/src/view/form/control/AphrontFormTokenizerControl.php
+++ b/src/view/form/control/AphrontFormTokenizerControl.php
@@ -94,9 +94,11 @@ final class AphrontFormTokenizerControl extends AphrontFormControl {
       'projects'        => pht('Type a project name...'),
       'repositories'    => pht('Type a repository name...'),
       'packages'        => pht('Type a package name...'),
+      'macros'          => pht('Type a macro name...'),
       'arcanistproject' => pht('Type an arc project name...'),
       'accountsorprojects' => pht('Type a user or project name...'),
-      'macros' => pht('Type a macro name...'),
+      'usersprojectsorpackages' =>
+        pht('Type a user, project, or package name...'),
     );
 
     return idx($map, $request);