diff --git a/features/draft/spec/rfc6797.yml b/features/draft/spec/rfc6797.yml
deleted file mode 100644
index 56995fc0f47..00000000000
--- a/features/draft/spec/rfc6797.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-draft_date: 2024-09-09
-name: HTTP Strict Transport Security (HSTS)
-description: TODO
-spec: https://www.rfc-editor.org/rfc/rfc6797
-compat_features:
-  - http.headers.Strict-Transport-Security
diff --git a/features/hsts.yml b/features/hsts.yml
new file mode 100644
index 00000000000..b163c8f3e26
--- /dev/null
+++ b/features/hsts.yml
@@ -0,0 +1,6 @@
+name: HTTP Strict Transport Security (HSTS)
+description: The `Strict-Transport-Security` HTTP response header (HSTS) informs browsers that the site should only be accessed using HTTPS, and that any future attempts to access it using HTTP should automatically be converted to HTTPS.
+spec: https://www.rfc-editor.org/rfc/rfc6797
+group: security
+compat_features:
+  - http.headers.Strict-Transport-Security
diff --git a/features/draft/spec/rfc6797.yml.dist b/features/hsts.yml.dist
similarity index 92%
rename from features/draft/spec/rfc6797.yml.dist
rename to features/hsts.yml.dist
index 5a5a3d3f75a..e1dc77ed64b 100644
--- a/features/draft/spec/rfc6797.yml.dist
+++ b/features/hsts.yml.dist
@@ -1,4 +1,4 @@
-# Generated from: rfc6797.yml
+# Generated from: hsts.yml
 # Do not edit this file by hand. Edit the source file instead!
 
 status: