diff --git a/features/draft/spec/rfc4120.yml b/features/draft/spec/rfc4120.yml
deleted file mode 100644
index 54f638b3ebd..00000000000
--- a/features/draft/spec/rfc4120.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-draft_date: 2024-09-09
-name: The Kerberos Network Authentication Service (V5)
-description: TODO
-spec: https://www.rfc-editor.org/rfc/rfc4120
-compat_features:
-  - http.headers.Authorization.Negotiate
-  - http.headers.WWW-Authenticate.Negotiate
diff --git a/features/draft/spec/rfc4120.yml.dist b/features/draft/spec/rfc4120.yml.dist
deleted file mode 100644
index 4abeefbba54..00000000000
--- a/features/draft/spec/rfc4120.yml.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated from: rfc4120.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: high
-  baseline_low_date: 2020-01-15
-  baseline_high_date: 2022-07-15
-  support:
-    chrome: "1"
-    chrome_android: "18"
-    edge: "79"
-    firefox: "1"
-    firefox_android: "4"
-    safari: ≤7
-    safari_ios: ≤7
-compat_features:
-  - http.headers.Authorization.Negotiate
-  - http.headers.WWW-Authenticate.Negotiate
diff --git a/features/draft/spec/rfc7616.yml b/features/draft/spec/rfc7616.yml
deleted file mode 100644
index d7eb0ed4867..00000000000
--- a/features/draft/spec/rfc7616.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-draft_date: 2024-10-21
-name: HTTP Digest Access Authentication
-description: TODO
-spec: https://httpwg.org/specs/rfc7616.html
-compat_features:
-  - http.headers.Authorization.Digest
-  - http.headers.Authorization.Digest.SHA-256
-  - http.headers.Authorization.Digest.md5
-  - http.headers.WWW-Authenticate.Digest
-  - http.headers.WWW-Authenticate.Digest.SHA-256
-  - http.headers.WWW-Authenticate.Digest.md5
diff --git a/features/http-authentication.yml b/features/http-authentication.yml
new file mode 100644
index 00000000000..a0b014c4441
--- /dev/null
+++ b/features/http-authentication.yml
@@ -0,0 +1,26 @@
+name: HTTP authentication
+description: The `Authorization` and `WWW-Authenticate` headers authenticate a user with a server.
+spec:
+  - https://httpwg.org/specs/rfc9110.html#authentication
+  - https://httpwg.org/specs/rfc7616.html
+  - https://www.rfc-editor.org/rfc/rfc4120
+status:
+  compute_from:
+    - http.headers.Authorization
+    - http.headers.WWW-Authenticate
+compat_features:
+  - http.headers.Authorization
+  - http.headers.Authorization.Basic
+  - http.headers.Authorization.Digest
+  - http.headers.Authorization.Digest.SHA-256
+  - http.headers.Authorization.Digest.md5
+  - http.headers.Authorization.NTLM
+  - http.headers.Authorization.Negotiate
+  - http.headers.Authorization.authorization_removed_cross_origin
+  - http.headers.WWW-Authenticate
+  - http.headers.WWW-Authenticate.Basic
+  - http.headers.WWW-Authenticate.Digest
+  - http.headers.WWW-Authenticate.Digest.SHA-256
+  - http.headers.WWW-Authenticate.Digest.md5
+  - http.headers.WWW-Authenticate.NTLM
+  - http.headers.WWW-Authenticate.Negotiate
diff --git a/features/draft/spec/rfc7616.yml.dist b/features/http-authentication.yml.dist
similarity index 51%
rename from features/draft/spec/rfc7616.yml.dist
rename to features/http-authentication.yml.dist
index 4d4873aaa79..d567be67936 100644
--- a/features/draft/spec/rfc7616.yml.dist
+++ b/features/http-authentication.yml.dist
@@ -1,15 +1,20 @@
-# Generated from: rfc7616.yml
+# Generated from: http-authentication.yml
 # Do not edit this file by hand. Edit the source file instead!
 
 status:
-  baseline: false
+  baseline: high
+  baseline_low_date: 2015-07-29
+  baseline_high_date: 2018-01-29
   support:
-    chrome: "117"
-    chrome_android: "117"
-    edge: "117"
-    firefox: "93"
-    firefox_android: "93"
+    chrome: "1"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "1"
+    firefox_android: "4"
+    safari: "1"
+    safari_ios: "1"
 compat_features:
+  # ⬇️ Same status as overall feature ⬇️
   # baseline: high
   # baseline_low_date: 2015-07-29
   # baseline_high_date: 2018-01-29
@@ -21,6 +26,10 @@ compat_features:
   #   firefox_android: "4"
   #   safari: "1"
   #   safari_ios: "1"
+  - http.headers.Authorization
+  - http.headers.Authorization.Basic
+  - http.headers.WWW-Authenticate
+  - http.headers.WWW-Authenticate.Basic
   - http.headers.WWW-Authenticate.Digest
   - http.headers.WWW-Authenticate.Digest.md5
 
@@ -38,7 +47,22 @@ compat_features:
   - http.headers.Authorization.Digest
   - http.headers.Authorization.Digest.md5
 
-  # ⬇️ Same status as overall feature ⬇️
+  # baseline: high
+  # baseline_low_date: 2020-01-15
+  # baseline_high_date: 2022-07-15
+  # support:
+  #   chrome: "1"
+  #   chrome_android: "18"
+  #   edge: "79"
+  #   firefox: "1"
+  #   firefox_android: "4"
+  #   safari: ≤7
+  #   safari_ios: ≤7
+  - http.headers.Authorization.NTLM
+  - http.headers.Authorization.Negotiate
+  - http.headers.WWW-Authenticate.NTLM
+  - http.headers.WWW-Authenticate.Negotiate
+
   # baseline: false
   # support:
   #   chrome: "117"
@@ -48,3 +72,11 @@ compat_features:
   #   firefox_android: "93"
   - http.headers.Authorization.Digest.SHA-256
   - http.headers.WWW-Authenticate.Digest.SHA-256
+
+  # baseline: false
+  # support:
+  #   firefox: "111"
+  #   firefox_android: "111"
+  #   safari: "16.1"
+  #   safari_ios: "16.1"
+  - http.headers.Authorization.authorization_removed_cross_origin
diff --git a/features/http11.yml b/features/http11.yml
index 3f936cbf98e..8528b3563d6 100644
--- a/features/http11.yml
+++ b/features/http11.yml
@@ -9,8 +9,6 @@ compat_features:
   - http.headers.Accept-Language
   - http.headers.Accept-Ranges
   - http.headers.Age
-  - http.headers.Authorization
-  - http.headers.Authorization.Basic
   - http.headers.Cache-Control
   - http.headers.Connection
   - http.headers.Content-Disposition
@@ -44,8 +42,6 @@ compat_features:
   - http.headers.User-Agent
   - http.headers.Vary
   - http.headers.Via
-  - http.headers.WWW-Authenticate
-  - http.headers.WWW-Authenticate.Basic
   - http.methods.CONNECT
   - http.methods.DELETE
   - http.methods.GET
diff --git a/features/http11.yml.dist b/features/http11.yml.dist
index fbdd0a65a84..2ac563c8aec 100644
--- a/features/http11.yml.dist
+++ b/features/http11.yml.dist
@@ -31,8 +31,6 @@ compat_features:
   - http.headers.Accept-Language
   - http.headers.Accept-Ranges
   - http.headers.Age
-  - http.headers.Authorization
-  - http.headers.Authorization.Basic
   - http.headers.Cache-Control
   - http.headers.Connection
   - http.headers.Content-Disposition
@@ -65,8 +63,6 @@ compat_features:
   - http.headers.User-Agent
   - http.headers.Vary
   - http.headers.Via
-  - http.headers.WWW-Authenticate
-  - http.headers.WWW-Authenticate.Basic
   - http.methods.CONNECT
   - http.methods.DELETE
   - http.methods.GET