diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6777243ca..31924152c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -77,6 +77,11 @@ jobs:
       - name: Build
         run: cargo build --all-targets --all-features
 
+      - name: Check docs.rs build
+        env:
+          RUSTDOCFLAGS: --cfg docsrs
+        run: cargo +nightly doc -p agent-client-protocol-schema --all-features --no-deps
+
       - name: Run tests
         run: cargo test --all-features
 
diff --git a/Cargo.toml b/Cargo.toml
index 5addfbf27..8661adf42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,10 @@ categories = ["development-tools", "api-bindings"]
 include = ["/src/**/*.rs", "/README.md", "/LICENSE", "/Cargo.toml"]
 rust-version = "1.88.0"
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
 [features]
 unstable = [
     "unstable_auth_methods",
diff --git a/src/lib.rs b/src/lib.rs
index c5a838d9f..236b3fdc6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(docsrs, feature(doc_cfg))]
+
 //! [![Agent Client Protocol](https://zed.dev/img/acp/banner-dark.webp)](https://agentclientprotocol.com/)
 //!
 //! # Agent Client Protocol Schema