diff --git a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
index 68cb0e79b2..4b231b959e 100644
--- a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
+++ b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
@@ -1,27 +1,29 @@
 <?php
 
 final class PhabricatorMetaMTAMailableFunctionDatasource
   extends PhabricatorTypeaheadCompositeDatasource {
 
   public function getBrowseTitle() {
     return pht('Browse Subscribers');
   }
 
   public function getPlaceholderText() {
-    return pht('Type a username, project, mailing list, or function...');
+    return pht(
+      'Type a username, project, mailing list, package, or function...');
   }
 
   public function getDatasourceApplicationClass() {
     return 'PhabricatorMetaMTAApplication';
   }
 
   public function getComponentDatasources() {
     return array(
       new PhabricatorViewerDatasource(),
       new PhabricatorPeopleDatasource(),
       new PhabricatorProjectMembersDatasource(),
       new PhabricatorProjectDatasource(),
+      new PhabricatorOwnersPackageDatasource(),
     );
   }
 
 }
diff --git a/src/applications/search/field/PhabricatorSearchSubscribersField.php b/src/applications/search/field/PhabricatorSearchSubscribersField.php
index 7102f33910..f3cf2094e9 100644
--- a/src/applications/search/field/PhabricatorSearchSubscribersField.php
+++ b/src/applications/search/field/PhabricatorSearchSubscribersField.php
@@ -1,27 +1,28 @@
 <?php
 
 final class PhabricatorSearchSubscribersField
   extends PhabricatorSearchTokenizerField {
 
   protected function getDefaultValue() {
     return array();
   }
 
   protected function getValueFromRequest(AphrontRequest $request, $key) {
     $allow_types = array(
       PhabricatorProjectProjectPHIDType::TYPECONST,
+      PhabricatorOwnersPackagePHIDType::TYPECONST,
     );
     return $this->getUsersFromRequest($request, $key, $allow_types);
   }
 
   protected function newDatasource() {
     return new PhabricatorMetaMTAMailableFunctionDatasource();
   }
 
   protected function newConduitParameterType() {
     // TODO: Ideally, this should eventually be a "Subscribers" type which
     // accepts projects as well.
     return new ConduitUserListParameterType();
   }
 
 }