diff --git a/features/text-wrap-balance.yml b/features/text-wrap-balance.yml
index 22003c359af..91dc1115463 100644
--- a/features/text-wrap-balance.yml
+++ b/features/text-wrap-balance.yml
@@ -1,4 +1,4 @@
 name: "text-wrap: balance"
 description: "The `text-wrap: balance` CSS declaration balances the length of each line when text is broken into multiple lines. Also known as headline balancing."
 spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-balance
-group: css
+group: text-wrap
diff --git a/features/text-wrap-mode.yml b/features/text-wrap-mode.yml
index 5886627e59f..c1b967dcd95 100644
--- a/features/text-wrap-mode.yml
+++ b/features/text-wrap-mode.yml
@@ -1,7 +1,9 @@
 name: text-wrap-mode
 description: The `text-wrap-mode` CSS property sets whether lines may wrap with the values `wrap` and `nowrap`. It is a longhand property for both `white-space` and `text-wrap`.
 spec: https://drafts.csswg.org/css-text-4/#text-wrap-mode
-group: white-space
+group:
+  - white-space
+  - text-wrap
 compat_features:
   - css.properties.text-wrap-mode
   - css.properties.text-wrap-mode.nowrap
diff --git a/features/text-wrap-nowrap.yml b/features/text-wrap-nowrap.yml
index 79c55ee31dd..85f77546e9c 100644
--- a/features/text-wrap-nowrap.yml
+++ b/features/text-wrap-nowrap.yml
@@ -1,4 +1,6 @@
 name: "text-wrap: nowrap"
 description: "The `text-wrap: nowrap` CSS declaration prevents text breaking into multiple lines. Text that doesn't fit overflows instead."
 spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-mode-nowrap
-group: css
+group: text-wrap
+compat_features:
+  - css.properties.text-wrap.nowrap
diff --git a/features/text-wrap-nowrap.yml.dist b/features/text-wrap-nowrap.yml.dist
index 6303045f6d7..9e0e7396a1f 100644
--- a/features/text-wrap-nowrap.yml.dist
+++ b/features/text-wrap-nowrap.yml.dist
@@ -14,4 +14,3 @@ status:
     safari_ios: "17.4"
 compat_features:
   - css.properties.text-wrap.nowrap
-  - css.properties.text-wrap.wrap
diff --git a/features/text-wrap-pretty.yml b/features/text-wrap-pretty.yml
index b5183961b80..69e68d0f19d 100644
--- a/features/text-wrap-pretty.yml
+++ b/features/text-wrap-pretty.yml
@@ -1,4 +1,4 @@
 name: "text-wrap: pretty"
 description: "The `text-wrap: pretty` CSS declaration prioritizes better layout over speed when text is broken into multiple lines."
 spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-pretty
-group: css
+group: text-wrap
diff --git a/features/text-wrap-stable.yml b/features/text-wrap-stable.yml
new file mode 100644
index 00000000000..ac17d387364
--- /dev/null
+++ b/features/text-wrap-stable.yml
@@ -0,0 +1,6 @@
+name: "text-wrap: stable"
+description: "The `text-wrap: stable` CSS declaration wraps text using the default algorithm, but does not change wrapping on earlier lines while the text is being edited."
+spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-stable
+group: text-wrap
+compat_features:
+  - css.properties.text-wrap.stable
diff --git a/features/text-wrap-stable.yml.dist b/features/text-wrap-stable.yml.dist
new file mode 100644
index 00000000000..bf96fd28bde
--- /dev/null
+++ b/features/text-wrap-stable.yml.dist
@@ -0,0 +1,12 @@
+# Generated from: text-wrap-stable.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support:
+    firefox: "121"
+    firefox_android: "121"
+    safari: "17.5"
+    safari_ios: "17.5"
+compat_features:
+  - css.properties.text-wrap.stable
diff --git a/features/text-wrap-style.yml b/features/text-wrap-style.yml
new file mode 100644
index 00000000000..fd33e8b82ce
--- /dev/null
+++ b/features/text-wrap-style.yml
@@ -0,0 +1,9 @@
+name: text-wrap-style
+description: The `text-wrap-style` CSS property sets how lines break in text that overflows the container. It can also be set with the `text-wrap` shorthand.
+spec: https://drafts.csswg.org/css-text-4/#text-wrap-style
+group: text-wrap
+compat_features:
+  - css.properties.text-wrap-style
+  - css.properties.text-wrap-style.auto
+  - css.properties.text-wrap-style.balance
+  - css.properties.text-wrap-style.stable
diff --git a/features/text-wrap-style.yml.dist b/features/text-wrap-style.yml.dist
new file mode 100644
index 00000000000..6cdc8ff6080
--- /dev/null
+++ b/features/text-wrap-style.yml.dist
@@ -0,0 +1,15 @@
+# Generated from: text-wrap-style.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support:
+    firefox: "124"
+    firefox_android: "124"
+    safari: "17.5"
+    safari_ios: "17.5"
+compat_features:
+  - css.properties.text-wrap-style
+  - css.properties.text-wrap-style.auto
+  - css.properties.text-wrap-style.balance
+  - css.properties.text-wrap-style.stable
diff --git a/features/text-wrap.yml b/features/text-wrap.yml
new file mode 100644
index 00000000000..e065c89e869
--- /dev/null
+++ b/features/text-wrap.yml
@@ -0,0 +1,7 @@
+name: text-wrap
+description: The `text-wrap` CSS property sets how lines break in text that overflows the container. It is a shorthand for `text-wrap-style` and `text-wrap-mode`.
+spec: https://drafts.csswg.org/css-text-4/#text-wrap-shorthand
+group: text-wrap
+compat_features:
+  - css.properties.text-wrap
+  - css.properties.text-wrap.wrap
diff --git a/features/text-wrap.yml.dist b/features/text-wrap.yml.dist
new file mode 100644
index 00000000000..f7c59d5b374
--- /dev/null
+++ b/features/text-wrap.yml.dist
@@ -0,0 +1,39 @@
+# Generated from: text-wrap.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: low
+  baseline_low_date: 2024-03-19
+  support:
+    chrome: "114"
+    chrome_android: "114"
+    edge: "114"
+    firefox: "124"
+    firefox_android: "124"
+    safari: "17.4"
+    safari_ios: "17.4"
+compat_features:
+  # baseline: low
+  # baseline_low_date: 2024-03-05
+  # support:
+  #   chrome: "114"
+  #   chrome_android: "114"
+  #   edge: "114"
+  #   firefox: "121"
+  #   firefox_android: "121"
+  #   safari: "17.4"
+  #   safari_ios: "17.4"
+  - css.properties.text-wrap
+
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: low
+  # baseline_low_date: 2024-03-19
+  # support:
+  #   chrome: "114"
+  #   chrome_android: "114"
+  #   edge: "114"
+  #   firefox: "124"
+  #   firefox_android: "124"
+  #   safari: "17.4"
+  #   safari_ios: "17.4"
+  - css.properties.text-wrap.wrap
diff --git a/groups/text-wrap.yml b/groups/text-wrap.yml
new file mode 100644
index 00000000000..2bbe9339aba
--- /dev/null
+++ b/groups/text-wrap.yml
@@ -0,0 +1,3 @@
+name: Text wrap
+# Features relating to how lines break.
+parent: css