diff --git a/css/selectors/-webkit-autofill.json b/css/selectors/-webkit-autofill.json
deleted file mode 100644
index 41a3a97c03053d..00000000000000
--- a/css/selectors/-webkit-autofill.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "css": {
-    "selectors": {
-      "-webkit-autofill": {
-        "__compat": {
-          "description": "<code>:-webkit-autofill</code>",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:-webkit-autofill",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "79"
-            },
-            "firefox": {
-              "version_added": false
-            },
-            "firefox_android": {
-              "version_added": false
-            },
-            "ie": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": "15"
-            },
-            "opera_android": {
-              "version_added": "14"
-            },
-            "safari": {
-              "version_added": "3"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": false,
-            "deprecated": false
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/css/selectors/autofill.json b/css/selectors/autofill.json
new file mode 100644
index 00000000000000..4b59412e73e4d1
--- /dev/null
+++ b/css/selectors/autofill.json
@@ -0,0 +1,76 @@
+{
+  "css": {
+    "selectors": {
+      "autofill": {
+        "__compat": {
+          "description": "<code>:autofill</code>",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:autofill",
+          "support": {
+            "chrome": {
+              "version_added": "1",
+              "prefix": "-webkit-"
+            },
+            "chrome_android": {
+              "version_added": "18",
+              "prefix": "-webkit-"
+            },
+            "edge": {
+              "version_added": "79",
+              "prefix": "-webkit-"
+            },
+            "firefox": [
+              {
+                "version_added": "86"
+              },
+              {
+                "prefix": "-webkit-",
+                "version_added": "86"
+              }
+            ],
+            "firefox_android": [
+              {
+                "version_added": "86"
+              },
+              {
+                "prefix": "-webkit-",
+                "version_added": "86"
+              }
+            ],
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "15",
+              "prefix": "-webkit-"
+            },
+            "opera_android": {
+              "version_added": "14",
+              "prefix": "-webkit-"
+            },
+            "safari": {
+              "version_added": "3",
+              "prefix": "-webkit-"
+            },
+            "safari_ios": {
+              "version_added": "1",
+              "prefix": "-webkit-"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0",
+              "prefix": "-webkit-"
+            },
+            "webview_android": {
+              "version_added": "1",
+              "prefix": "-webkit-"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      }
+    }
+  }
+}