diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index debee6de59..acfc7b2ff1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1451,6 +1451,7 @@ phutil_register_library_map(array(
     'LiskRawMigrationIterator' => 'infrastructure/storage/lisk/LiskRawMigrationIterator.php',
     'MacroConduitAPIMethod' => 'applications/macro/conduit/MacroConduitAPIMethod.php',
     'MacroCreateMemeConduitAPIMethod' => 'applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php',
+    'MacroEditConduitAPIMethod' => 'applications/macro/conduit/MacroEditConduitAPIMethod.php',
     'MacroEmojiExample' => 'applications/uiexample/examples/MacroEmojiExample.php',
     'MacroQueryConduitAPIMethod' => 'applications/macro/conduit/MacroQueryConduitAPIMethod.php',
     'ManiphestAssignEmailCommand' => 'applications/maniphest/command/ManiphestAssignEmailCommand.php',
@@ -6479,6 +6480,7 @@ phutil_register_library_map(array(
     'LiskRawMigrationIterator' => 'PhutilBufferedIterator',
     'MacroConduitAPIMethod' => 'ConduitAPIMethod',
     'MacroCreateMemeConduitAPIMethod' => 'MacroConduitAPIMethod',
+    'MacroEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'MacroEmojiExample' => 'PhabricatorUIExample',
     'MacroQueryConduitAPIMethod' => 'MacroConduitAPIMethod',
     'ManiphestAssignEmailCommand' => 'ManiphestEmailCommand',
diff --git a/src/applications/macro/conduit/MacroEditConduitAPIMethod.php b/src/applications/macro/conduit/MacroEditConduitAPIMethod.php
new file mode 100644
index 0000000000..de5fd38655
--- /dev/null
+++ b/src/applications/macro/conduit/MacroEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class MacroEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'macro.edit';
+  }
+
+  public function newEditEngine() {
+    return new PhabricatorMacroEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new macro or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/macro/editor/PhabricatorMacroEditEngine.php b/src/applications/macro/editor/PhabricatorMacroEditEngine.php
index 95627d2e11..ff348c3163 100644
--- a/src/applications/macro/editor/PhabricatorMacroEditEngine.php
+++ b/src/applications/macro/editor/PhabricatorMacroEditEngine.php
@@ -87,7 +87,7 @@ final class PhabricatorMacroEditEngine
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Macro name.'))
-        ->setConduitDescription(pht('Rename the macro.'))
+        ->setConduitDescription(pht('Name of the macro.'))
         ->setConduitTypeDescription(pht('New macro name.'))
         ->setTransactionType(PhabricatorMacroNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)