diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9abb155..3f657933 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,15 +55,15 @@ jobs:
             - name: cargo doc (ring)
               run: cargo doc --features ring,pem,x509-parser --document-private-items
               env:
-                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=docsrs' || '-Dwarnings' }}
+                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=rcgen_docsrs' || '-Dwarnings' }}
             - name: cargo doc (aws_lc_rs_unstable)
               run: cargo doc --features aws_lc_rs_unstable,pem,x509-parser --document-private-items
               env:
-                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=docsrs' || '-Dwarnings' }}
+                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=rcgen_docsrs' || '-Dwarnings' }}
             - name: cargo doc (fips)
               run: cargo doc --no-default-features --features fips --document-private-items
               env:
-                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=docsrs' || '-Dwarnings' }}
+                  RUSTDOCFLAGS: ${{ matrix.toolchain == 'nightly' && '-Dwarnings --cfg=rcgen_docsrs' || '-Dwarnings' }}
 
     check-external-types:
         name: Validate external types appearing in public API
diff --git a/rcgen/Cargo.toml b/rcgen/Cargo.toml
index dac874ca..0e52f9aa 100644
--- a/rcgen/Cargo.toml
+++ b/rcgen/Cargo.toml
@@ -44,7 +44,8 @@ name = "simple"
 required-features = ["crypto", "pem"]
 
 [package.metadata.docs.rs]
-features = ["x509-parser"]
+features = ["aws_lc_rs",  "aws_lc_rs_unstable", "crypto", "ring", "x509-parser"]
+rustdoc-args = ["--cfg", "rcgen_docsrs"]
 
 [package.metadata.cargo_check_external_types]
 allowed_external_types = [
@@ -52,3 +53,6 @@ allowed_external_types = [
     "zeroize::Zeroize",
     "rustls_pki_types::*",
 ]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(rcgen_docsrs)"] }
diff --git a/rcgen/src/lib.rs b/rcgen/src/lib.rs
index 1e2adf19..c42f3d0b 100644
--- a/rcgen/src/lib.rs
+++ b/rcgen/src/lib.rs
@@ -29,7 +29,7 @@ println!("{}", signing_key.serialize_pem());
 #![forbid(unsafe_code)]
 #![forbid(non_ascii_idents)]
 #![deny(missing_docs)]
-#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(rcgen_docsrs, feature(doc_cfg))]
 #![warn(unreachable_pub)]
 
 use std::borrow::Cow;