diff --git a/features/draft/file-and-directory-entries.yml b/features/draft/file-and-directory-entries.yml
deleted file mode 100644
index 21d0e75627f..00000000000
--- a/features/draft/file-and-directory-entries.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-draft_date: 2024-05-07
-name: File and directory entries
-description: File and directory entries represent a virtual file system for working with files and directories dragged and dropped into the browser.
-spec: https://wicg.github.io/entries-api/
-compat_features:
-  - api.DataTransferItem.webkitGetAsEntry
-  - api.FileSystem
-  - api.FileSystem.name
-  - api.FileSystem.root
-  - api.FileSystemDirectoryEntry
-  - api.FileSystemDirectoryEntry.createReader
-  - api.FileSystemDirectoryEntry.getDirectory
-  - api.FileSystemDirectoryEntry.getFile
-  - api.FileSystemDirectoryHandle
-  - api.FileSystemDirectoryHandle.entries
-  - api.FileSystemDirectoryHandle.getDirectoryHandle
-  - api.FileSystemDirectoryHandle.getFileHandle
-  - api.FileSystemDirectoryHandle.keys
-  - api.FileSystemDirectoryHandle.removeEntry
-  - api.FileSystemDirectoryHandle.resolve
-  - api.FileSystemDirectoryHandle.values
-  - api.FileSystemDirectoryHandle.@@asyncIterator
-  - api.FileSystemDirectoryReader
-  - api.FileSystemDirectoryReader.readEntries
-  - api.FileSystemEntry
-  - api.FileSystemEntry.filesystem
-  - api.FileSystemEntry.fullPath
-  - api.FileSystemEntry.getParent
-  - api.FileSystemEntry.isDirectory
-  - api.FileSystemEntry.isFile
-  - api.FileSystemEntry.name
-  - api.FileSystemFileEntry
-  - api.FileSystemFileEntry.file
-  - api.FileSystemFileHandle
-  - api.FileSystemFileHandle.getFile
-  - api.FileSystemHandle
-  - api.FileSystemHandle.isSameEntry
-  - api.FileSystemHandle.kind
-  - api.FileSystemHandle.name
-  - api.HTMLInputElement.webkitEntries
diff --git a/features/file-and-directory-entries.yml b/features/file-and-directory-entries.yml
new file mode 100644
index 00000000000..e4c8c72f6f8
--- /dev/null
+++ b/features/file-and-directory-entries.yml
@@ -0,0 +1,35 @@
+name: File and Directory Entries
+description: The File and Directory Entries API accesses items that are provided by the user either via an `<input type="file">` HTML element or a drag-and-drop operation as a list of files and directories.
+spec: https://wicg.github.io/entries-api/
+group: file-system
+compat_features:
+  - api.FileSystem
+  - api.FileSystem.name
+  - api.FileSystem.root
+
+  - api.FileSystemEntry
+  - api.FileSystemEntry.filesystem
+  - api.FileSystemEntry.fullPath
+  - api.FileSystemEntry.getParent
+  - api.FileSystemEntry.isDirectory
+  - api.FileSystemEntry.isFile
+  - api.FileSystemEntry.name
+
+  - api.FileSystemFileEntry
+  - api.FileSystemFileEntry.file
+
+  - api.FileSystemDirectoryEntry
+  - api.FileSystemDirectoryEntry.createReader
+  - api.FileSystemDirectoryEntry.getDirectory
+  - api.FileSystemDirectoryEntry.getFile
+
+  - api.FileSystemDirectoryReader
+  - api.FileSystemDirectoryReader.readEntries
+
+  - api.File.webkitRelativePath
+
+  # These are the real entry points to the API.
+  # They were never implemented in Firefox for Android.
+  - api.HTMLInputElement.webkitEntries
+  - api.HTMLInputElement.webkitdirectory
+  - api.DataTransferItem.webkitGetAsEntry
diff --git a/features/draft/file-and-directory-entries.yml.dist b/features/file-and-directory-entries.yml.dist
similarity index 68%
rename from features/draft/file-and-directory-entries.yml.dist
rename to features/file-and-directory-entries.yml.dist
index 7602af95f70..b0d60a4706c 100644
--- a/features/draft/file-and-directory-entries.yml.dist
+++ b/features/file-and-directory-entries.yml.dist
@@ -4,12 +4,12 @@
 status:
   baseline: false
   support:
-    chrome: "86"
-    chrome_android: "109"
-    edge: "86"
-    firefox: "111"
-    safari: "16.4"
-    safari_ios: "16.4"
+    chrome: "22"
+    chrome_android: "132"
+    edge: "79"
+    firefox: "52"
+    safari: "11.1"
+    safari_ios: "18.4"
 compat_features:
   # baseline: high
   # baseline_low_date: ≤2018-10-02
@@ -89,42 +89,25 @@ compat_features:
   #   safari_ios: "11.3"
   - api.FileSystemDirectoryEntry.createReader
 
-  # baseline: low
-  # baseline_low_date: 2023-03-14
+  # baseline: false
   # support:
-  #   chrome: "86"
-  #   chrome_android: "109"
-  #   edge: "86"
-  #   firefox: "111"
-  #   firefox_android: "111"
-  #   safari: "15.2"
-  #   safari_ios: "15.2"
-  - api.FileSystemDirectoryHandle
-  - api.FileSystemDirectoryHandle.entries
-  - api.FileSystemDirectoryHandle.getDirectoryHandle
-  - api.FileSystemDirectoryHandle.getFileHandle
-  - api.FileSystemDirectoryHandle.keys
-  - api.FileSystemDirectoryHandle.removeEntry
-  - api.FileSystemDirectoryHandle.resolve
-  - api.FileSystemDirectoryHandle.values
-  - api.FileSystemFileHandle
-  - api.FileSystemFileHandle.getFile
-  - api.FileSystemHandle
-  - api.FileSystemHandle.isSameEntry
-  - api.FileSystemHandle.kind
-  - api.FileSystemHandle.name
+  #   chrome: "7"
+  #   chrome_android: "132"
+  #   edge: "13"
+  #   firefox: "50"
+  #   safari: "11.1"
+  #   safari_ios: "18.4"
+  - api.HTMLInputElement.webkitdirectory
 
-  # baseline: low
-  # baseline_low_date: 2023-03-27
+  # baseline: false
   # support:
-  #   chrome: "86"
-  #   chrome_android: "109"
-  #   edge: "86"
-  #   firefox: "111"
-  #   firefox_android: "111"
-  #   safari: "16.4"
-  #   safari_ios: "16.4"
-  - api.FileSystemDirectoryHandle.@@asyncIterator
+  #   chrome: "13"
+  #   chrome_android: "18"
+  #   edge: "13"
+  #   firefox: "50"
+  #   safari: "11.1"
+  #   safari_ios: "11.3"
+  - api.File.webkitRelativePath
 
   # baseline: false
   # support: