diff --git a/README.md b/README.md
index 555baae44403..65a22de70127 100644
--- a/README.md
+++ b/README.md
@@ -96,16 +96,23 @@ Since version `1.11.0`, we have been providing TypeScript definitions under an e
 No, you are expected to import only the components (or other public APIs) that you are going to use and bundle them along with the rest
 of your application.
 
-## Browser Support
+## Browser and Platform Support
 
-UI5 Web Components are supported by all major modern browsers.
+UI5 Web Components are supported by all major modern browsers on the desktop and mobile platforms listed below.
 
-Browser | Supported versions
---------|--------
-Chrome | Latest two stable releases
-Firefox | Latest two stable releases
-Safari | Latest two stable releases
-Edge | Latest two stable releases
+### Desktop
+
+|                                | Google Chrome   | Microsoft Edge  | Mozilla Firefox | Mozilla Firefox ESR | Apple Safari    |
+| ------------------------------ | --------------- | --------------- | --------------- | ------------------- | --------------- |
+| **Windows** (versions 10 & 11) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest              | n/a             |
+| **macOS** (Latest 2 versions)  | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest              | Latest 2 Stable |
+
+### Mobile
+
+|                                   | Google Chrome   | Apple Safari    |
+| --------------------------------- | --------------- | --------------- |
+| **Android** (Latest 3 versions)   | Latest 2 Stable | n/a             |
+| **iOS & iPadOS** (Latest version) | -               | Latest 2 Stable |
 
 ## Project Structure, Development and Build
 
diff --git a/docs/11-Browser-and-Platform-Support.md b/docs/11-Browser-and-Platform-Support.md
new file mode 100644
index 000000000000..83d0a7bf8b61
--- /dev/null
+++ b/docs/11-Browser-and-Platform-Support.md
@@ -0,0 +1,22 @@
+---
+sidebar_label: Browser and Platform Support
+title: Browser and Platform Support
+---
+
+# Browser and Platform Support
+
+UI5 Web Components are supported by all major modern browsers on the desktop and mobile platforms listed below.
+
+## Desktop
+
+|                                | Google Chrome   | Microsoft Edge  | Mozilla Firefox | Mozilla Firefox ESR | Apple Safari    |
+| ------------------------------ | --------------- | --------------- | --------------- | ------------------- | --------------- |
+| **Windows** (versions 10 & 11) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest              | n/a             |
+| **macOS** (Latest 2 versions)  | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest              | Latest 2 Stable |
+
+## Mobile
+
+|                                   | Google Chrome   | Apple Safari    |
+| --------------------------------- | --------------- | --------------- |
+| **Android** (Latest 3 versions)   | Latest 2 Stable | n/a             |
+| **iOS & iPadOS** (Latest version) | -               | Latest 2 Stable |
diff --git a/docs/11-FAQ.md b/docs/12-FAQ.md
similarity index 100%
rename from docs/11-FAQ.md
rename to docs/12-FAQ.md