diff --git a/java/google/registry/tools/CreateOrUpdateTldCommand.java b/java/google/registry/tools/CreateOrUpdateTldCommand.java
index cfcabdc43..aa7484d85 100644
--- a/java/google/registry/tools/CreateOrUpdateTldCommand.java
+++ b/java/google/registry/tools/CreateOrUpdateTldCommand.java
@@ -171,6 +171,15 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
   ImmutableSortedMap<DateTime, Money> renewBillingCostTransitions =
       ImmutableSortedMap.of();
 
+  @Parameter(
+      names = "--eap_fee_schedule",
+      converter = BillingCostTransitions.class,
+      validateWith = BillingCostTransitions.class,
+      description = "Comma-delimited list of EAP fees effective on specific dates, of the form "
+          + "<time>=<money-amount>[,<time>=<money-amount>]* where each amount represents the "
+          + "EAP fee for creating a new domain under the TLD.")
+  ImmutableSortedMap<DateTime, Money> eapFeeSchedule = ImmutableSortedMap.of();
+
   @Nullable
   @Parameter(
       names = "--reserved_lists",
@@ -271,6 +280,10 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
         builder.setRenewBillingCostTransitions(renewBillingCostTransitions);
       }
 
+      if (!eapFeeSchedule.isEmpty()) {
+        builder.setEapFeeSchedule(eapFeeSchedule);
+      }
+
       if (addGracePeriod != null) {
         builder.setAddGracePeriodLength(addGracePeriod);
       }
diff --git a/java/google/registry/tools/CreateTldCommand.java b/java/google/registry/tools/CreateTldCommand.java
index af7baf641..c16087ab4 100644
--- a/java/google/registry/tools/CreateTldCommand.java
+++ b/java/google/registry/tools/CreateTldCommand.java
@@ -80,9 +80,9 @@ class CreateTldCommand extends CreateOrUpdateTldCommand {
 
     builder.setCurrency(currency);
 
-    // If this is a non-default currency, set the EAP fee schedule to a matching currency.
-    // TODO(b/29089413): once we have a flag for this, don't do this check if the flag is set.
-    if (currency != Registry.DEFAULT_CURRENCY) {
+    // If this is a non-default currency and the user hasn't specified an EAP fee schedule, set the
+    // EAP fee schedule to a matching currency.
+    if (currency != Registry.DEFAULT_CURRENCY && eapFeeSchedule.isEmpty()) {
       builder.setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(currency)));
     }
   }
diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java
index 9bf81355d..cfb238c82 100644
--- a/javatests/google/registry/tools/CreateTldCommandTest.java
+++ b/javatests/google/registry/tools/CreateTldCommandTest.java
@@ -44,6 +44,8 @@ import java.io.PrintStream;
 /** Unit tests for {@link CreateTldCommand}. */
 public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
 
+  private static final String DATETIME_FORMAT = "YYYY-MM-dd'T'HH:mm:ssZZ";
+
   @Before
   public void init() {
     persistReservedList("common_abuse", "baa,FULLY_BLOCKED");
@@ -91,6 +93,25 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
         .isEqualTo(Money.of(USD, 42.42));
   }
 
+  @Test
+  public void testSuccess_eapFeeSchedule() throws Exception {
+    DateTime now = DateTime.now(UTC);
+    DateTime tomorrow = now.plusDays(1);
+    runCommandForced(
+        String.format(
+            "--eap_fee_schedule=\"%s=USD 0.00,%s=USD 50.00,%s=USD 10.00\"",
+            START_OF_TIME.toString(DATETIME_FORMAT),
+            now.toString(DATETIME_FORMAT),
+            tomorrow.toString(DATETIME_FORMAT)),
+        "--roid_suffix=Q9JYB4C",
+        "xn--q9jyb4c");
+
+    Registry registry = Registry.get("xn--q9jyb4c");
+    assertThat(registry.getEapFeeFor(now.minusHours(1))).isEqualTo(Money.zero(USD));
+    assertThat(registry.getEapFeeFor(now.plusHours(1))).isEqualTo(Money.of(USD, 50));
+    assertThat(registry.getEapFeeFor(now.plusDays(1).plusHours(1))).isEqualTo(Money.of(USD, 10));
+  }
+
   @Test
   public void testSuccess_addGracePeriodFlag() throws Exception {
     runCommandForced("--add_grace_period=PT300S", "--roid_suffix=Q9JYB4C", "xn--q9jyb4c");
@@ -230,6 +251,17 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
         "--initial_renew_billing_cost=USD -42", "--roid_suffix=Q9JYB4C", "xn--q9jyb4c");
   }
 
+  @Test
+  public void testFailure_invalidEapCurrency() throws Exception {
+    thrown.expect(IllegalArgumentException.class);
+    runCommandForced(
+        String.format(
+            "--eap_fee_schedule=\"%s=JPY 123456\"",
+            START_OF_TIME.toString(DATETIME_FORMAT)),
+        "--roid_suffix=Q9JYB4C",
+        "xn--q9jyb4c");
+  }
+
   @Test
   public void testFailure_noTldName() throws Exception {
     thrown.expect(ParameterException.class);