diff --git a/features/composed-ranges.yml b/features/composed-ranges.yml
new file mode 100644
index 00000000000..c25452645dd
--- /dev/null
+++ b/features/composed-ranges.yml
@@ -0,0 +1,8 @@
+name: Selection composed ranges
+description: The `window.getSelection().getComposedRanges()` method returns ranges that represent the current user selection, even if the selection spans across shadow tree boundaries.
+spec: https://w3c.github.io/selection-api/#dom-selection-getcomposedranges
+group:
+  - selection
+  - web-components
+compat_features:
+  - api.Selection.getComposedRanges
diff --git a/features/composed-ranges.yml.dist b/features/composed-ranges.yml.dist
new file mode 100644
index 00000000000..6d43816bcf4
--- /dev/null
+++ b/features/composed-ranges.yml.dist
@@ -0,0 +1,10 @@
+# Generated from: composed-ranges.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support:
+    safari: "17"
+    safari_ios: "17"
+compat_features:
+  - api.Selection.getComposedRanges
diff --git a/features/draft/spec/selection-api.yml b/features/draft/spec/selection-api.yml
deleted file mode 100644
index 49bbc4a8699..00000000000
--- a/features/draft/spec/selection-api.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-draft_date: 2024-09-09
-name: Selection API
-description: TODO
-spec: https://w3c.github.io/selection-api/
-compat_features:
-  - api.Document
-  - api.Document.getSelection
-  - api.Document.selectionchange_event
-  - api.HTMLInputElement.selectionchange_event
-  - api.HTMLTextAreaElement.selectionchange_event
-  - api.Node.selectstart_event
-  - api.Selection
-  - api.Selection.addRange
-  - api.Selection.anchorNode
-  - api.Selection.anchorOffset
-  - api.Selection.collapse
-  - api.Selection.collapseToEnd
-  - api.Selection.collapseToStart
-  - api.Selection.containsNode
-  - api.Selection.deleteFromDocument
-  - api.Selection.direction
-  - api.Selection.empty
-  - api.Selection.extend
-  - api.Selection.focusNode
-  - api.Selection.focusOffset
-  - api.Selection.getComposedRanges
-  - api.Selection.getRangeAt
-  - api.Selection.isCollapsed
-  - api.Selection.modify
-  - api.Selection.rangeCount
-  - api.Selection.removeAllRanges
-  - api.Selection.removeRange
-  - api.Selection.selectAllChildren
-  - api.Selection.setBaseAndExtent
-  - api.Selection.setPosition
-  - api.Selection.toString
-  - api.Selection.type
-  - api.Window.getSelection
diff --git a/features/selection-api.yml b/features/selection-api.yml
new file mode 100644
index 00000000000..851119714ad
--- /dev/null
+++ b/features/selection-api.yml
@@ -0,0 +1,58 @@
+name: Selection
+description: The Selection API controls and modifies user text selections within the page.
+spec: https://w3c.github.io/selection-api/
+caniuse: selection-api
+group: selection
+status:
+  compute_from:
+    # This makes it roughly match caniuse data.
+    - api.Window.getSelection
+    - api.Document.selectionchange_event
+compat_features:
+  - api.Document.getSelection
+  - api.Document.selectionchange_event
+  - api.Selection
+  - api.Selection.addRange
+  - api.Selection.anchorNode
+  - api.Selection.anchorOffset
+  - api.Selection.collapse
+  - api.Selection.collapseToEnd
+  - api.Selection.collapseToStart
+  - api.Selection.containsNode
+  - api.Selection.deleteFromDocument
+  - api.Selection.empty
+  - api.Selection.extend
+  - api.Selection.focusNode
+  - api.Selection.focusOffset
+  - api.Selection.getRangeAt
+  - api.Selection.isCollapsed
+  - api.Selection.rangeCount
+  - api.Selection.removeAllRanges
+  - api.Selection.selectAllChildren
+  - api.Selection.setBaseAndExtent
+  - api.Selection.setPosition
+  - api.Selection.toString
+  - api.Selection.type
+  - api.Window.getSelection
+
+  # The selectionchange events on <input> and <textarea> are not really needed.
+  # The event is fired on document too and this is what developers use.
+  - api.HTMLInputElement.selectionchange_event
+  - api.HTMLTextAreaElement.selectionchange_event
+
+  # The node.selectstart event is not supported on Safari iOS.
+  # Unclear if developers need it because selectionchange is supported.
+  - api.Node.selectstart_event
+
+  # Direction is supported only on Firefox and Safari.
+  # Maybe split into a separate feature.
+  - api.Selection.direction
+
+  # Modify seems like a nice-to-have, you can do the same thing with other methods.
+  # Edge only added support for this in 79, even though the rest of the API was
+  # supported much earlier. And Firefox doesn't support all modify commands.
+  - api.Selection.modify
+
+  # removeRange is baseline low because it was only added in Safari 17.
+  # Maybe split into a separate feature.
+  - api.Selection.removeRange
diff --git a/features/draft/spec/selection-api.yml.dist b/features/selection-api.yml.dist
similarity index 94%
rename from features/draft/spec/selection-api.yml.dist
rename to features/selection-api.yml.dist
index d4900d3dd11..6b67dd5b6f9 100644
--- a/features/draft/spec/selection-api.yml.dist
+++ b/features/selection-api.yml.dist
@@ -2,8 +2,17 @@
 # Do not edit this file by hand. Edit the source file instead!
 
 status:
-  baseline: false
-  support: {}
+  baseline: high
+  baseline_low_date: 2017-03-07
+  baseline_high_date: 2019-09-07
+  support:
+    chrome: "11"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "52"
+    firefox_android: "52"
+    safari: "5.1"
+    safari_ios: "5"
 compat_features:
   # baseline: high
   # baseline_low_date: 2015-07-29
@@ -16,7 +25,6 @@ compat_features:
   #   firefox_android: "4"
   #   safari: "1"
   #   safari_ios: "1"
-  - api.Document
   - api.Window.getSelection
 
   # baseline: high
@@ -86,6 +94,7 @@ compat_features:
   #   safari_ios: "3.2"
   - api.Document.getSelection
 
+  # ⬇️ Same status as overall feature ⬇️
   # baseline: high
   # baseline_low_date: 2017-03-07
   # baseline_high_date: 2019-09-07
@@ -194,12 +203,6 @@ compat_features:
   #   safari_ios: "17"
   - api.Selection.direction
 
-  # baseline: false
-  # support:
-  #   safari: "17"
-  #   safari_ios: "17"
-  - api.Selection.getComposedRanges
-
   # baseline: false
   # support:
   #   firefox: "92"
diff --git a/features/selection.yml b/features/selection.yml
index eeefa19a091..9d3999765ef 100644
--- a/features/selection.yml
+++ b/features/selection.yml
@@ -2,6 +2,8 @@ name: ::selection
 description: The `::selection` CSS pseudo-element selects text a user has highlighted.
 spec: https://drafts.csswg.org/css-pseudo-4/#selectordef-selection
 caniuse: css-selection
-group: selectors
+group:
+  - selectors
+  - selection
 compat_features:
   - css.selectors.selection
diff --git a/features/text-decoration-selection.yml b/features/text-decoration-selection.yml
index 1344ca14169..4b4e90ade16 100644
--- a/features/text-decoration-selection.yml
+++ b/features/text-decoration-selection.yml
@@ -1,6 +1,8 @@
 name: text-decoration in ::selection
 description: The `text-decoration` CSS property in a `::selection` rule sets the underline and other text decoration styles on the text a user has highlighted.
 spec: https://drafts.csswg.org/css-pseudo-4/#highlight-styling
-group: selectors
+group:
+  - selectors
+  - selection
 compat_features:
   - css.selectors.selection.text-decoration
diff --git a/groups/selection.yml b/groups/selection.yml
new file mode 100644
index 00000000000..2d2451592a9
--- /dev/null
+++ b/groups/selection.yml
@@ -0,0 +1 @@
+name: Selection