diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0769392f8..d61c88f97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -162,6 +162,10 @@ v1.2 maintenance release.
 * Added missing scraper entries for samcoupe and zx81 for TheGamesDB and zmachine for ScreenScraper
 * neogeocd is now scraped specifically as "Neo Geo CD" instead of the more generic "Neo Geo"
 * (rbsimple-DE) Made the xbox console graphics slightly darker
+* Added a CMake flag to build as Flatpak which prefixes "flatpak-spawn --host" to all launch commands
+* A check is now done on game launch that emulator binaries are actually files or symlinks
+* (Unix) The RetroArch core path search order now matches the emulator binary search order
+* (Unix) Renamed the icon emulationstation.svg to org.es_de.emulationstation-de.svg
 
 ### Bug fixes
 
diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index 00b0f3289..3a3c34949 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -1359,6 +1359,7 @@ Here's an example es_find_rules.xml file for Unix (this is not the complete file
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry>
             <entry>~/Applications/RetroArch-Linux-x86_64.AppImage</entry>
             <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry>
             <entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry>
@@ -1366,18 +1367,18 @@ Here's an example es_find_rules.xml file for Unix (this is not the complete file
     </emulator>
     <core name="RETROARCH">
         <rule type="corepath">
-            <!-- Snap package -->
-            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
-            <!-- Flatpak package -->
-            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
-            <!-- AppImage and compiled from source -->
-            <entry>~/.config/retroarch/cores</entry>
             <!-- Ubuntu and Linux Mint repository -->
             <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
             <!-- Fedora repository -->
             <entry>/usr/lib64/libretro</entry>
             <!-- Manjaro repository -->
             <entry>/usr/lib/libretro</entry>
+            <!-- Snap package -->
+            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
+            <!-- Flatpak package -->
+            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
+            <!-- AppImage and compiled from source -->
+            <entry>~/.config/retroarch/cores</entry>
             <!-- FreeBSD and OpenBSD repository -->
             <entry>/usr/local/lib/libretro</entry>
             <!-- NetBSD repository -->
diff --git a/INSTALL.md b/INSTALL.md
index ed0d488c0..484669f86 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1642,6 +1642,7 @@ Here's an example es_find_rules.xml file for Unix (this is not the complete file
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry>
             <entry>~/Applications/RetroArch-Linux-x86_64.AppImage</entry>
             <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry>
             <entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry>
@@ -1649,18 +1650,18 @@ Here's an example es_find_rules.xml file for Unix (this is not the complete file
     </emulator>
     <core name="RETROARCH">
         <rule type="corepath">
-            <!-- Snap package -->
-            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
-            <!-- Flatpak package -->
-            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
-            <!-- AppImage and compiled from source -->
-            <entry>~/.config/retroarch/cores</entry>
             <!-- Ubuntu and Linux Mint repository -->
             <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
             <!-- Fedora repository -->
             <entry>/usr/lib64/libretro</entry>
             <!-- Manjaro repository -->
             <entry>/usr/lib/libretro</entry>
+            <!-- Snap package -->
+            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
+            <!-- Flatpak package -->
+            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
+            <!-- AppImage and compiled from source -->
+            <entry>~/.config/retroarch/cores</entry>
             <!-- FreeBSD and OpenBSD repository -->
             <entry>/usr/local/lib/libretro</entry>
             <!-- NetBSD repository -->
diff --git a/README.md b/README.md
index 992252f9a..ddac28250 100644
--- a/README.md
+++ b/README.md
@@ -62,8 +62,6 @@ All previous releases can be downloaded from [here](https://gitlab.com/leonstyhr
 
 The _current_ version of the Linux AppImage ships with newer libraries and better controller support but requires distributions with libc 2.34 or later to work.
 
-Flatpak will not be supported on Linux as this packaging system is too restrictive with its sandbox approach, making ES-DE virtually useless as it can't freely locate and launch emulators on the system.
-
 If using FreeBSD, NetBSD or OpenBSD you will need to build ES-DE from source code for the time being, as explained in [INSTALL.md](INSTALL.md).
 
 Please refer to [CHANGELOG.md](CHANGELOG.md) for more information about the releases, including known issues.