diff --git a/features/container-scroll-state-queries.yml b/features/container-scroll-state-queries.yml
new file mode 100644
index 00000000000..322c9420eeb
--- /dev/null
+++ b/features/container-scroll-state-queries.yml
@@ -0,0 +1,10 @@
+name: Container scroll-state queries
+description: Container scroll-state queries with the `@container scroll-state(...)` at-rule apply styles to an element based on the sticky positioning, snapped, and scrollable state of the container.
+# Note that a fourth state for scroll direction is being discussed:
+# https://github.com/w3c/csswg-drafts/issues/6400
+# https://github.com/w3c/csswg-drafts/issues/11191
+# TODO: If shipped, update the description or split into smaller features.
+spec: https://drafts.csswg.org/css-conditional-5/#scroll-state-container
+group: container-queries
+compat_features:
+  - css.properties.container-type.scroll-state
diff --git a/features/container-scroll-state-queries.yml.dist b/features/container-scroll-state-queries.yml.dist
new file mode 100644
index 00000000000..02b0bba17ed
--- /dev/null
+++ b/features/container-scroll-state-queries.yml.dist
@@ -0,0 +1,8 @@
+# Generated from: container-scroll-state-queries.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support: {}
+compat_features:
+  - css.properties.container-type.scroll-state