diff --git a/features/paint-timing.yml b/features/paint-timing.yml
index e768770a69f..8540fdbeede 100644
--- a/features/paint-timing.yml
+++ b/features/paint-timing.yml
@@ -2,7 +2,14 @@ name: Paint timing
 description: The `paint` performance entry and the `PerformancePaintTiming` API measures the duration of "paint" (also called "render") operations as a page loads. The API measures the time to First Paint (FP) and First Contentful Paint (FCP), common metrics for perceived loading times.
 spec: https://w3c.github.io/paint-timing/
 group: performance
+status:
+  compute_from:
+    # This is what developers want out of this API, and these are implemented in all browsers.
+    - api.PerformancePaintTiming
+    - api.PerformancePaintTiming.first-contentful-paint
 compat_features:
   - api.PerformancePaintTiming
   - api.PerformancePaintTiming.first-contentful-paint
+  - api.PerformancePaintTiming.toJSON
+  # first-paint isn't part of compute_from because it's optional for user agents to report it.
   - api.PerformancePaintTiming.first-paint
diff --git a/features/paint-timing.yml.dist b/features/paint-timing.yml.dist
index 5127aab9f16..959ca38155b 100644
--- a/features/paint-timing.yml.dist
+++ b/features/paint-timing.yml.dist
@@ -3,7 +3,11 @@
 
 status:
   baseline: false
-  support: {}
+  support:
+    firefox: "84"
+    firefox_android: "84"
+    safari: "14.1"
+    safari_ios: "14.5"
 compat_features:
   # baseline: high
   # baseline_low_date: 2021-04-26
@@ -17,7 +21,9 @@ compat_features:
   #   safari: "14.1"
   #   safari_ios: "14.5"
   - api.PerformancePaintTiming
+  - api.PerformancePaintTiming.toJSON
 
+  # ⬇️ Same status as overall feature ⬇️
   # baseline: false
   # support:
   #   firefox: "84"
@@ -26,7 +32,6 @@ compat_features:
   #   safari_ios: "14.5"
   - api.PerformancePaintTiming.first-contentful-paint
 
-  # ⬇️ Same status as overall feature ⬇️
   # baseline: false
   # support: {}
   - api.PerformancePaintTiming.first-paint