diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b567e5a9e9..279e9d6c44 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3940,6 +3940,7 @@ phutil_register_library_map(array(
     'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
     'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
     'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php',
+    'PhabricatorStorageManagementOptimizeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementOptimizeWorkflow.php',
     'PhabricatorStorageManagementPartitionWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementPartitionWorkflow.php',
     'PhabricatorStorageManagementProbeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php',
     'PhabricatorStorageManagementQuickstartWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php',
@@ -9286,6 +9287,7 @@ phutil_register_library_map(array(
     'PhabricatorStorageManagementDatabasesWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementDestroyWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementDumpWorkflow' => 'PhabricatorStorageManagementWorkflow',
+    'PhabricatorStorageManagementOptimizeWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementPartitionWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementProbeWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementQuickstartWorkflow' => 'PhabricatorStorageManagementWorkflow',
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementOptimizeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementOptimizeWorkflow.php
new file mode 100644
index 0000000000..5c1c49b0b2
--- /dev/null
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementOptimizeWorkflow.php
@@ -0,0 +1,86 @@
+<?php
+
+final class PhabricatorStorageManagementOptimizeWorkflow
+  extends PhabricatorStorageManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('optimize')
+      ->setExamples('**optimize**')
+      ->setSynopsis(pht('Run "OPTIMIZE TABLE" on tables to reclaim space.'));
+  }
+
+  public function didExecute(PhutilArgumentParser $args) {
+    $api = $this->getSingleAPI();
+    $conn = $api->getConn(null);
+
+    $patches = $this->getPatches();
+    $databases = $api->getDatabaseList($patches, true);
+
+    $total_bytes = 0;
+    foreach ($databases as $database) {
+      queryfx($conn, 'USE %C', $database);
+
+      $tables = queryfx_all($conn, 'SHOW TABLE STATUS');
+      foreach ($tables as $table) {
+        $table_name = $table['Name'];
+        $old_bytes =
+          $table['Data_length'] +
+          $table['Index_length'] +
+          $table['Data_free'];
+
+        $this->logInfo(
+          pht('OPTIMIZE'),
+          pht(
+            'Optimizing table "%s"."%s"...',
+            $database,
+            $table_name));
+
+        $t_start = microtime(true);
+        queryfx(
+          $conn,
+          'OPTIMIZE TABLE %T',
+          $table_name);
+        $t_end = microtime(true);
+
+        $status = queryfx_one(
+          $conn,
+          'SHOW TABLE STATUS LIKE %s',
+          $table_name);
+
+        $new_bytes =
+          $status['Data_length'] +
+          $status['Index_length'] +
+          $status['Data_free'];
+
+        $duration_ms = (int)(1000 * ($t_end - $t_start));
+
+        if ($old_bytes > $new_bytes) {
+          $this->logOkay(
+            pht('DONE'),
+            pht(
+              'Compacted table by %s in %sms.',
+              phutil_format_bytes($old_bytes - $new_bytes),
+              new PhutilNumber($duration_ms)));
+        } else {
+          $this->logInfo(
+            pht('DONE'),
+            pht(
+              'Optimized table (in %sms) but it had little effect.',
+              new PhutilNumber($duration_ms)));
+        }
+
+        $total_bytes += ($old_bytes - $new_bytes);
+      }
+    }
+
+    $this->logOkay(
+      pht('OPTIMIZED'),
+      pht(
+        'Completed optimizations, reclaimed %s of disk space.',
+        phutil_format_bytes($total_bytes)));
+
+    return 0;
+  }
+
+}