diff --git a/resources/sql/autopatches/20170526.milestones.php b/resources/sql/autopatches/20170526.milestones.php
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20170526.milestones.php
@@ -0,0 +1,11 @@
+<?php
+
+$table = new PhabricatorProject();
+
+foreach (new LiskMigrationIterator($table) as $project) {
+  PhabricatorSearchWorker::queueDocumentForIndexing(
+    $project->getPHID(),
+    array(
+      'force' => true,
+    ));
+}
diff --git a/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
--- a/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
+++ b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
@@ -34,10 +34,6 @@
   }
 
   private function materializeProject(PhabricatorProject $project) {
-    if ($project->isMilestone()) {
-      return;
-    }
-
     $material_type = PhabricatorProjectMaterializedMemberEdgeType::EDGECONST;
     $member_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
 
@@ -59,6 +55,10 @@
       $has_subprojects = false;
     }
 
+    if ($project->isMilestone()) {
+      $source_phids = array($project->getParentProjectPHID());
+    }
+
     $conn_w = $project->establishConnection('w');
 
     $any_milestone = queryfx_one(