diff --git a/features/draft/spec/geolocation.yml b/features/geolocation.yml
similarity index 66%
rename from features/draft/spec/geolocation.yml
rename to features/geolocation.yml
index 29da7798464..accdfb74ac4 100644
--- a/features/draft/spec/geolocation.yml
+++ b/features/geolocation.yml
@@ -1,11 +1,14 @@
-draft_date: 2024-08-12
 name: Geolocation
-description: TODO
+description: The `navigator.gelocation` API requests the user's latitude, longitude, heading, and speed.
 spec: https://w3c.github.io/geolocation/
+status:
+  compute_from: api.Navigator.geolocation
+caniuse: geolocation
 compat_features:
   - api.Geolocation
   - api.Geolocation.clearWatch
   - api.Geolocation.getCurrentPosition
+  - api.Geolocation.secure_context_required
   - api.Geolocation.watchPosition
   - api.GeolocationCoordinates
   - api.GeolocationCoordinates.accuracy
@@ -14,14 +17,18 @@ compat_features:
   - api.GeolocationCoordinates.heading
   - api.GeolocationCoordinates.latitude
   - api.GeolocationCoordinates.longitude
+  - api.GeolocationCoordinates.secure_context_required
   - api.GeolocationCoordinates.speed
   - api.GeolocationCoordinates.toJSON
   - api.GeolocationPosition
   - api.GeolocationPosition.coords
+  - api.GeolocationPosition.secure_context_required
   - api.GeolocationPosition.timestamp
   - api.GeolocationPosition.toJSON
   - api.GeolocationPositionError
   - api.GeolocationPositionError.code
   - api.GeolocationPositionError.message
+  - api.GeolocationPositionError.secure_context_required
   - api.Navigator.geolocation
+  - api.Navigator.geolocation.secure_context_required
   - http.headers.Permissions-Policy.geolocation
diff --git a/features/draft/spec/geolocation.yml.dist b/features/geolocation.yml.dist
similarity index 63%
rename from features/draft/spec/geolocation.yml.dist
rename to features/geolocation.yml.dist
index 1a1f29c12d2..969329fdd26 100644
--- a/features/draft/spec/geolocation.yml.dist
+++ b/features/geolocation.yml.dist
@@ -2,12 +2,19 @@
 # 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: "126"
-    chrome_android: "126"
-    edge: "126"
+    chrome: "5"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "3.5"
+    firefox_android: "4"
+    safari: "5"
+    safari_ios: ≤3
 compat_features:
+  # ⬇️ Same status as overall feature ⬇️
   # baseline: high
   # baseline_low_date: 2015-07-29
   # baseline_high_date: 2018-01-29
@@ -25,6 +32,32 @@ compat_features:
   - api.Geolocation.watchPosition
   - api.Navigator.geolocation
 
+  # baseline: high
+  # baseline_low_date: 2020-01-15
+  # baseline_high_date: 2022-07-15
+  # support:
+  #   chrome: "47"
+  #   chrome_android: "47"
+  #   edge: "79"
+  #   firefox: "55"
+  #   firefox_android: "55"
+  #   safari: "10"
+  #   safari_ios: "10"
+  - api.Navigator.geolocation.secure_context_required
+
+  # baseline: high
+  # baseline_low_date: 2020-01-15
+  # baseline_high_date: 2022-07-15
+  # support:
+  #   chrome: "50"
+  #   chrome_android: "50"
+  #   edge: "79"
+  #   firefox: "55"
+  #   firefox_android: "55"
+  #   safari: "10"
+  #   safari_ios: "10"
+  - api.Geolocation.secure_context_required
+
   # baseline: high
   # baseline_low_date: 2020-07-28
   # baseline_high_date: 2023-01-28
@@ -43,13 +76,16 @@ compat_features:
   - api.GeolocationCoordinates.heading
   - api.GeolocationCoordinates.latitude
   - api.GeolocationCoordinates.longitude
+  - api.GeolocationCoordinates.secure_context_required
   - api.GeolocationCoordinates.speed
   - api.GeolocationPosition
   - api.GeolocationPosition.coords
+  - api.GeolocationPosition.secure_context_required
   - api.GeolocationPosition.timestamp
   - api.GeolocationPositionError
   - api.GeolocationPositionError.code
   - api.GeolocationPositionError.message
+  - api.GeolocationPositionError.secure_context_required
 
   # baseline: false
   # support:
@@ -58,7 +94,6 @@ compat_features:
   #   edge: "88"
   - http.headers.Permissions-Policy.geolocation
 
-  # ⬇️ Same status as overall feature ⬇️
   # baseline: false
   # support:
   #   chrome: "126"