diff --git a/features/draft/html-elements/fieldset.yml b/features/fieldset.yml
similarity index 72%
rename from features/draft/html-elements/fieldset.yml
rename to features/fieldset.yml
index 7de251c457f..4d1e3d40ae1 100644
--- a/features/draft/html-elements/fieldset.yml
+++ b/features/fieldset.yml
@@ -1,10 +1,15 @@
-draft_date: 2024-06-05
-name: <fieldset>
-description: The `<fieldset>` element TODO.
+name: <fieldset> and <legend>
+description: The `<fieldset>` and `<legend>` elements group several form control elements within a web form.
 spec:
   - https://html.spec.whatwg.org/multipage/form-elements.html#the-fieldset-element
   - https://html.spec.whatwg.org/multipage/form-elements.html#the-legend-element
-group: forms
+group:
+  - forms
+  - html-elements
+status:
+  compute_from:
+    - html.elements.fieldset
+    - html.elements.legend
 compat_features:
   - api.HTMLFieldSetElement
   - api.HTMLFieldSetElement.disabled
diff --git a/features/draft/html-elements/fieldset.yml.dist b/features/fieldset.yml.dist
similarity index 92%
rename from features/draft/html-elements/fieldset.yml.dist
rename to features/fieldset.yml.dist
index 26e439026a7..e55beff3d58 100644
--- a/features/draft/html-elements/fieldset.yml.dist
+++ b/features/fieldset.yml.dist
@@ -2,14 +2,17 @@
 # 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: "57"
-    chrome_android: "57"
-    firefox: "4"
+    chrome: "1"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "1"
     firefox_android: "4"
-    safari: "13"
-    safari_ios: "13"
+    safari: ≤4
+    safari_ios: ≤3.2
 compat_features:
   # baseline: high
   # baseline_low_date: 2015-07-29
@@ -40,6 +43,7 @@ compat_features:
   - api.HTMLFieldSetElement.form
   - html.elements.legend
 
+  # ⬇️ Same status as overall feature ⬇️
   # baseline: high
   # baseline_low_date: 2015-07-29
   # baseline_high_date: 2018-01-29