diff --git a/features/import.yml b/features/import.yml
new file mode 100644
index 00000000000..1391cb5dd3e
--- /dev/null
+++ b/features/import.yml
@@ -0,0 +1,10 @@
+name: "@import"
+description: The `@import` CSS at-rule loads styles from another stylesheet.
+spec: https://drafts.csswg.org/css-cascade-5/#at-import
+group: css
+compat_features:
+  - css.at-rules.import
+  - api.CSSImportRule
+  - api.CSSImportRule.href
+  - api.CSSImportRule.media
+  - api.CSSImportRule.styleSheet
diff --git a/features/import.yml.dist b/features/import.yml.dist
new file mode 100644
index 00000000000..25e422658ce
--- /dev/null
+++ b/features/import.yml.dist
@@ -0,0 +1,21 @@
+# Generated from: import.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2015-07-29
+  baseline_high_date: 2018-01-29
+  support:
+    chrome: "1"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "1"
+    firefox_android: "4"
+    safari: "1"
+    safari_ios: "1"
+compat_features:
+  - api.CSSImportRule
+  - api.CSSImportRule.href
+  - api.CSSImportRule.media
+  - api.CSSImportRule.styleSheet
+  - css.at-rules.import
diff --git a/features/supports.yml b/features/supports.yml
new file mode 100644
index 00000000000..82da152dbe0
--- /dev/null
+++ b/features/supports.yml
@@ -0,0 +1,16 @@
+name: "@supports"
+description: The `@supports` at-rule applies styles based on a browser's support for CSS features, such as a CSS property and value. Also known as feature queries.
+spec: https://drafts.csswg.org/css-conditional-3/#at-supports
+caniuse: css-featurequeries
+group: css
+status:
+  compute_from: css.at-rules.supports
+compat_features:
+  # TODO: see discussion on https://github.com/web-platform-dx/web-features/pull/1353#discussion_r1673871428
+  # - api.CSSImportRule.supportsText
+  - api.CSSSupportsRule
+  - css.at-rules.import.supports
+  - css.at-rules.supports
+  - css.at-rules.supports.font-format
+  - css.at-rules.supports.font-tech
+  - css.at-rules.supports.selector
diff --git a/features/supports.yml.dist b/features/supports.yml.dist
new file mode 100644
index 00000000000..0ce61716d76
--- /dev/null
+++ b/features/supports.yml.dist
@@ -0,0 +1,65 @@
+# Generated from: supports.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2015-09-30
+  baseline_high_date: 2018-03-30
+  support:
+    chrome: "28"
+    chrome_android: "28"
+    edge: "12"
+    firefox: "22"
+    firefox_android: "22"
+    safari: "9"
+    safari_ios: "9"
+compat_features:
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: high
+  # baseline_low_date: 2015-09-30
+  # baseline_high_date: 2018-03-30
+  # support:
+  #   chrome: "28"
+  #   chrome_android: "28"
+  #   edge: "12"
+  #   firefox: "22"
+  #   firefox_android: "22"
+  #   safari: "9"
+  #   safari_ios: "9"
+  - api.CSSSupportsRule
+  - css.at-rules.supports
+
+  # baseline: high
+  # baseline_low_date: 2021-04-26
+  # baseline_high_date: 2023-10-26
+  # support:
+  #   chrome: "83"
+  #   chrome_android: "83"
+  #   edge: "83"
+  #   firefox: "69"
+  #   firefox_android: "79"
+  #   safari: "14.1"
+  #   safari_ios: "14.5"
+  - css.at-rules.supports.selector
+
+  # baseline: low
+  # baseline_low_date: 2023-09-18
+  # support:
+  #   chrome: "108"
+  #   chrome_android: "108"
+  #   edge: "108"
+  #   firefox: "106"
+  #   firefox_android: "106"
+  #   safari: "17"
+  #   safari_ios: "17"
+  - css.at-rules.supports.font-format
+  - css.at-rules.supports.font-tech
+
+  # baseline: false
+  # support:
+  #   chrome: "122"
+  #   chrome_android: "122"
+  #   edge: "122"
+  #   firefox: "115"
+  #   firefox_android: "115"
+  - css.at-rules.import.supports