diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
index 75d5b8226b4c85..f1c0906f4c4dfc 100644
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -154,7 +154,6 @@ Design Documents
 .. toctree::
    :maxdepth: 1
 
-   DesignDocs/AvailabilityMarkup
    DesignDocs/DebugMode
    DesignDocs/CapturingConfigInfo
    DesignDocs/ABIVersioning
diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 05d670368fe945..faa108156dee40 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -202,6 +202,17 @@ steps:
         - exit_status: -1  # Agent was lost
           limit: 2
 
+  - label: "Documentation"
+    command: "libcxx/utils/ci/run-buildbot.sh documentation"
+    artifact_paths:
+      - "**/test-results.xml"
+    agents:
+      queue: "libcxx-builders"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
   - label: "Legacy standalone build"
     command: "libcxx/utils/ci/run-buildbot.sh legacy-standalone"
     artifact_paths:
diff --git a/libcxx/utils/ci/run-buildbot.sh b/libcxx/utils/ci/run-buildbot.sh
index 1f0b3c7c71b37e..5502cde7c7046e 100755
--- a/libcxx/utils/ci/run-buildbot.sh
+++ b/libcxx/utils/ci/run-buildbot.sh
@@ -169,6 +169,13 @@ benchmarks)
     generate-cmake
     check-cxx-benchmarks
 ;;
+documentation)
+  export CC=clang
+  export CXX=clang++
+  generate-cmake -DLLVM_ENABLE_SPHINX=ON
+  echo "+++ Generating documentation"
+  ninja -C "${BUILD_DIR}" docs-libcxx-html
+;;
 unified-standalone)
     export CC=clang
     export CXX=clang++