diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index 260e6dd..4a86dae 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -37,7 +37,7 @@
       --nojava_header_compilation \
       --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
       --compilation_mode=opt \
-      --experimental_distdir=derived/distdir \
+      --distdir=derived/distdir \
       ${EXTRA_BAZEL_ARGS:-}"
 
 if [ -z "${BAZEL-}" ]; then
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java
index 6e9954d..d3ced96 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java
@@ -47,17 +47,17 @@
   public PathFragment experimentalRepositoryCache;
 
   @Option(
-    name = "experimental_distdir",
-    defaultValue = "null",
-    allowMultiple = true,
-    documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
-    effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
-    metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-    converter = OptionsUtils.PathFragmentConverter.class,
-    help =
-        "Additional places to search for archives before accessing the network "
-            + "to download them."
-  )
+      name = "distdir",
+      oldName = "experimental_distdir",
+      defaultValue = "null",
+      allowMultiple = true,
+      documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
+      effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
+      metadataTags = {OptionMetadataTag.EXPERIMENTAL},
+      converter = OptionsUtils.PathFragmentConverter.class,
+      help =
+          "Additional places to search for archives before accessing the network "
+              + "to download them.")
   public List<PathFragment> experimentalDistdir;
 
   @Option(
diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh
index 6557f85..5c93100 100755
--- a/src/test/shell/bazel/external_integration_test.sh
+++ b/src/test/shell/bazel/external_integration_test.sh
@@ -1355,7 +1355,7 @@
 EOF
 
   bazel clean --expunge
-  bazel build --experimental_distdir="${WRKDIR}/distfiles" //:local \
+  bazel build --distdir="${WRKDIR}/distfiles" //:local \
     || fail "expected success"
 }
 
@@ -1399,7 +1399,7 @@
 EOF
 
   bazel clean --expunge
-  bazel build --experimental_distdir="../distfiles" //:local \
+  bazel build --distdir="../distfiles" //:local \
     || fail "expected success"
 }