diff --git a/api/Document.json b/api/Document.json
index 7f69eacb49cce6..bc24bf87fb7be9 100644
--- a/api/Document.json
+++ b/api/Document.json
@@ -4632,6 +4632,8 @@
       },
       "exitPictureInPicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/exitPictureInPicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#document-extensions",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -8555,6 +8557,8 @@
       },
       "pictureInPictureEnabled": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/pictureInPictureEnabled",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#document-extensions",
           "support": {
             "chrome": {
               "version_added": "69"
diff --git a/api/HTMLVideoElement.json b/api/HTMLVideoElement.json
index 16b77bfafa33b0..aac2f2cedb29b7 100644
--- a/api/HTMLVideoElement.json
+++ b/api/HTMLVideoElement.json
@@ -49,6 +49,8 @@
       },
       "autoPictureInPicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/autoPictureInPicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#htmlvideoelement-extensions",
           "support": {
             "chrome": {
               "version_added": false
@@ -143,6 +145,57 @@
       },
       "disablePictureInPicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/disablePictureInPicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#htmlvideoelement-extensions",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
+      "enterpictureinpicture_event": {
+        "__compat": {
+          "description": "<code>enterpictureinpicture</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/enterpictureinpicture_event",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -298,6 +351,55 @@
           }
         }
       },
+      "leavepictureinpicture_event": {
+        "__compat": {
+          "description": "<code>leavepictureinpicture</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/leavepictureinpicture_event",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "mozDecodedFrames": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/mozDecodedFrames",
@@ -637,6 +739,8 @@
       },
       "onenterpictureinpicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/onenterpictureinpicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#htmlvideoelement-extensions",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -684,6 +788,8 @@
       },
       "onleavepictureinpicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/onleavepictureinpicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#htmlvideoelement-extensions",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -826,6 +932,8 @@
       },
       "requestPictureInPicture": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/requestPictureInPicture",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#htmlvideoelement-extensions",
           "support": {
             "chrome": {
               "version_added": "69"
diff --git a/api/PictureInPicture.json b/api/PictureInPicture.json
deleted file mode 100644
index 3f2b311c82b272..00000000000000
--- a/api/PictureInPicture.json
+++ /dev/null
@@ -1,332 +0,0 @@
-{
-  "api": {
-    "PictureInPicture": {
-      "__compat": {
-        "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPicture",
-        "support": {
-          "chrome": {
-            "version_added": "69",
-            "flags": [
-              {
-                "type": "preference",
-                "name": "enable-experimental-web-platform-features",
-                "value_to_set": "enabled"
-              },
-              {
-                "type": "preference",
-                "name": "enable-surfaces-for-videos",
-                "value_to_set": "enabled"
-              },
-              {
-                "type": "preference",
-                "name": "enable-picture-in-picture",
-                "value_to_set": "enabled"
-              }
-            ]
-          },
-          "chrome_android": {
-            "version_added": false
-          },
-          "edge": {
-            "version_added": "≤79",
-            "flags": [
-              {
-                "type": "preference",
-                "name": "enable-experimental-web-platform-features",
-                "value_to_set": "enabled"
-              },
-              {
-                "type": "preference",
-                "name": "enable-surfaces-for-videos",
-                "value_to_set": "enabled"
-              },
-              {
-                "type": "preference",
-                "name": "enable-picture-in-picture",
-                "value_to_set": "enabled"
-              }
-            ]
-          },
-          "firefox": {
-            "version_added": null
-          },
-          "firefox_android": {
-            "version_added": null
-          },
-          "ie": {
-            "version_added": null
-          },
-          "opera": {
-            "version_added": false
-          },
-          "opera_android": {
-            "version_added": false
-          },
-          "safari": {
-            "version_added": null
-          },
-          "safari_ios": {
-            "version_added": null
-          },
-          "samsunginternet_android": {
-            "version_added": false
-          },
-          "webview_android": {
-            "version_added": false
-          }
-        },
-        "status": {
-          "experimental": true,
-          "standard_track": false,
-          "deprecated": false
-        }
-      },
-      "height": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPicture/height",
-          "support": {
-            "chrome": {
-              "version_added": "69",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "chrome_android": {
-              "version_added": false
-            },
-            "edge": {
-              "version_added": "≤79",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "firefox": {
-              "version_added": null
-            },
-            "firefox_android": {
-              "version_added": null
-            },
-            "ie": {
-              "version_added": null
-            },
-            "opera": {
-              "version_added": false
-            },
-            "opera_android": {
-              "version_added": false
-            },
-            "safari": {
-              "version_added": null
-            },
-            "safari_ios": {
-              "version_added": null
-            },
-            "samsunginternet_android": {
-              "version_added": false
-            },
-            "webview_android": {
-              "version_added": false
-            }
-          },
-          "status": {
-            "experimental": true,
-            "standard_track": false,
-            "deprecated": false
-          }
-        }
-      },
-      "onresize": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPicture/onresize",
-          "support": {
-            "chrome": {
-              "version_added": "69",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "chrome_android": {
-              "version_added": false
-            },
-            "edge": {
-              "version_added": "≤79",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "firefox": {
-              "version_added": null
-            },
-            "firefox_android": {
-              "version_added": null
-            },
-            "ie": {
-              "version_added": null
-            },
-            "opera": {
-              "version_added": false
-            },
-            "opera_android": {
-              "version_added": false
-            },
-            "safari": {
-              "version_added": null
-            },
-            "safari_ios": {
-              "version_added": null
-            },
-            "samsunginternet_android": {
-              "version_added": false
-            },
-            "webview_android": {
-              "version_added": false
-            }
-          },
-          "status": {
-            "experimental": true,
-            "standard_track": false,
-            "deprecated": false
-          }
-        }
-      },
-      "width": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPicture/width",
-          "support": {
-            "chrome": {
-              "version_added": "69",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "chrome_android": {
-              "version_added": false
-            },
-            "edge": {
-              "version_added": "≤79",
-              "flags": [
-                {
-                  "type": "preference",
-                  "name": "enable-experimental-web-platform-features",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-surfaces-for-videos",
-                  "value_to_set": "enabled"
-                },
-                {
-                  "type": "preference",
-                  "name": "enable-picture-in-picture",
-                  "value_to_set": "enabled"
-                }
-              ]
-            },
-            "firefox": {
-              "version_added": null
-            },
-            "firefox_android": {
-              "version_added": null
-            },
-            "ie": {
-              "version_added": null
-            },
-            "opera": {
-              "version_added": false
-            },
-            "opera_android": {
-              "version_added": false
-            },
-            "safari": {
-              "version_added": null
-            },
-            "safari_ios": {
-              "version_added": null
-            },
-            "samsunginternet_android": {
-              "version_added": false
-            },
-            "webview_android": {
-              "version_added": false
-            }
-          },
-          "status": {
-            "experimental": true,
-            "standard_track": false,
-            "deprecated": false
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/api/PictureInPictureEvent.json b/api/PictureInPictureEvent.json
new file mode 100644
index 00000000000000..a60080f6e8ceed
--- /dev/null
+++ b/api/PictureInPictureEvent.json
@@ -0,0 +1,196 @@
+{
+  "api": {
+    "PictureInPictureEvent": {
+      "__compat": {
+        "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureEvent",
+        "spec_url": "https://w3c.github.io/picture-in-picture/#event-types",
+        "support": {
+          "chrome": [
+            {
+              "version_added": "85"
+            },
+            {
+              "version_added": "69",
+              "version_removed": "85",
+              "alternative_name": "EnterPictureInPictureEvent"
+            }
+          ],
+          "chrome_android": {
+            "version_added": false
+          },
+          "edge": [
+            {
+              "version_added": "85"
+            },
+            {
+              "version_added": "79",
+              "version_removed": "85",
+              "alternative_name": "EnterPictureInPictureEvent"
+            }
+          ],
+          "firefox": {
+            "version_added": false
+          },
+          "firefox_android": {
+            "version_added": false
+          },
+          "ie": {
+            "version_added": false
+          },
+          "opera": [
+            {
+              "version_added": "71"
+            },
+            {
+              "version_added": "56",
+              "version_removed": "71",
+              "alternative_name": "EnterPictureInPictureEvent"
+            }
+          ],
+          "opera_android": {
+            "version_added": false
+          },
+          "safari": {
+            "version_added": "13.1",
+            "alternative_name": "EnterPictureInPictureEvent"
+          },
+          "safari_ios": {
+            "version_added": "13.4",
+            "alternative_name": "EnterPictureInPictureEvent"
+          },
+          "samsunginternet_android": {
+            "version_added": false
+          },
+          "webview_android": {
+            "version_added": false
+          }
+        },
+        "status": {
+          "experimental": false,
+          "standard_track": true,
+          "deprecated": false
+        }
+      },
+      "PictureInPictureEvent": {
+        "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureEvent/PictureInPictureEvent",
+          "description": "<code>PictureInPictureEvent()</code> constructor",
+          "support": {
+            "chrome": [
+              {
+                "version_added": "85"
+              },
+              {
+                "version_added": "69",
+                "version_removed": "85",
+                "alternative_name": "EnterPictureInPictureEvent"
+              }
+            ],
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": [
+              {
+                "version_added": "85"
+              },
+              {
+                "version_added": "79",
+                "version_removed": "85",
+                "alternative_name": "EnterPictureInPictureEvent"
+              }
+            ],
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": [
+              {
+                "version_added": "71"
+              },
+              {
+                "version_added": "56",
+                "version_removed": "71",
+                "alternative_name": "EnterPictureInPictureEvent"
+              }
+            ],
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1",
+              "alternative_name": "EnterPictureInPictureEvent"
+            },
+            "safari_ios": {
+              "version_added": "13.4",
+              "alternative_name": "EnterPictureInPictureEvent"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
+      "pictureInPictureWindow": {
+        "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureEvent/pictureInPictureWindow",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/api/PictureInPictureWindow.json b/api/PictureInPictureWindow.json
index dee1f6db76986e..a2a1b52379e240 100644
--- a/api/PictureInPictureWindow.json
+++ b/api/PictureInPictureWindow.json
@@ -2,6 +2,8 @@
   "api": {
     "PictureInPictureWindow": {
       "__compat": {
+        "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow",
+        "spec_url": "https://w3c.github.io/picture-in-picture/#interface-picture-in-picture-window",
         "support": {
           "chrome": {
             "version_added": "69"
@@ -48,6 +50,7 @@
       },
       "height": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/height",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -95,6 +98,56 @@
       },
       "onresize": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/onresize",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
+      "resize_event": {
+        "__compat": {
+          "description": "<code>resize</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/resize_event",
           "support": {
             "chrome": {
               "version_added": "69"
@@ -142,6 +195,7 @@
       },
       "width": {
         "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/width",
           "support": {
             "chrome": {
               "version_added": "69"
diff --git a/api/_mixins/DocumentOrShadowRoot__Document.json b/api/_mixins/DocumentOrShadowRoot__Document.json
index f562fac2387534..4fd8cd5aa120c5 100644
--- a/api/_mixins/DocumentOrShadowRoot__Document.json
+++ b/api/_mixins/DocumentOrShadowRoot__Document.json
@@ -444,6 +444,55 @@
           }
         }
       },
+      "pictureInPictureElement": {
+        "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/pictureInPictureElement",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#documentorshadowroot-extension",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "pointerLockElement": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/pointerLockElement",
diff --git a/api/_mixins/DocumentOrShadowRoot__ShadowRoot.json b/api/_mixins/DocumentOrShadowRoot__ShadowRoot.json
index 49b18b6d66ffe0..ee9dc1e1276aee 100644
--- a/api/_mixins/DocumentOrShadowRoot__ShadowRoot.json
+++ b/api/_mixins/DocumentOrShadowRoot__ShadowRoot.json
@@ -373,6 +373,55 @@
           }
         }
       },
+      "pictureInPictureElement": {
+        "__compat": {
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ShadowRoot/pictureInPictureElement",
+          "spec_url": "https://w3c.github.io/picture-in-picture/#documentorshadowroot-extension",
+          "support": {
+            "chrome": {
+              "version_added": "69"
+            },
+            "chrome_android": {
+              "version_added": false
+            },
+            "edge": {
+              "version_added": "79"
+            },
+            "firefox": {
+              "version_added": false
+            },
+            "firefox_android": {
+              "version_added": false
+            },
+            "ie": {
+              "version_added": false
+            },
+            "opera": {
+              "version_added": "56"
+            },
+            "opera_android": {
+              "version_added": false
+            },
+            "safari": {
+              "version_added": "13.1"
+            },
+            "safari_ios": {
+              "version_added": "13.4"
+            },
+            "samsunginternet_android": {
+              "version_added": false
+            },
+            "webview_android": {
+              "version_added": false
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "pointerLockElement": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/ShadowRoot/pointerLockElement",