diff --git a/.github/linux-appimage-qt.sh b/.github/linux-appimage-qt.sh
index 06d5cbc11a..ad3081f6d0 100755
--- a/.github/linux-appimage-qt.sh
+++ b/.github/linux-appimage-qt.sh
@@ -27,7 +27,7 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh
 
 cp -a "$GITHUB_WORKSPACE/build/translations" AppDir/usr/bin
 
-./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop  -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --plugin qt 
+./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/dist/net.shadps4.shadps4.desktop  -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --plugin qt
 rm AppDir/usr/plugins/multimedia/libgstreamermediaplugin.so
 ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage
 mv Shadps4-x86_64.AppImage Shadps4-qt.AppImage
diff --git a/.github/linux-appimage-sdl.sh b/.github/linux-appimage-sdl.sh
index cc0e9f5fa4..61587bb52e 100755
--- a/.github/linux-appimage-sdl.sh
+++ b/.github/linux-appimage-sdl.sh
@@ -17,5 +17,5 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh
 # Build AppImage
 ./linuxdeploy-x86_64.AppImage --appdir AppDir
 ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir
-./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop  -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --output appimage
+./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/dist/net.shadps4.shadps4.desktop  -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --output appimage
 mv Shadps4-x86_64.AppImage Shadps4-sdl.AppImage
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9479e851c..596f0aeb74 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -930,6 +930,9 @@ endif()
 install(TARGETS shadps4 BUNDLE DESTINATION .)
 
 if (ENABLE_QT_GUI AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    install(FILES ".github/shadps4.desktop" DESTINATION "share/applications")
-    install(FILES ".github/shadps4.png" DESTINATION "share/icons/hicolor/512x512/apps")
+    install(FILES "dist/net.shadps4.shadps4.desktop" DESTINATION "share/applications")
+    install(FILES "dist/net.shadps4.shadps4.releases.xml" DESTINATION "share/metainfo/releases")
+    install(FILES "dist/net.shadps4.shadps4.metainfo.xml" DESTINATION "share/metainfo")
+    install(FILES ".github/shadps4.png" DESTINATION "share/icons/hicolor/512x512/apps" RENAME "net.shadps4.shadps4.png")
+
 endif()
diff --git a/.github/shadps4.desktop b/dist/net.shadps4.shadps4.desktop
similarity index 59%
rename from .github/shadps4.desktop
rename to dist/net.shadps4.shadps4.desktop
index 095acb7876..5593a97cb1 100644
--- a/.github/shadps4.desktop
+++ b/dist/net.shadps4.shadps4.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Shadps4
+Name=shadPS4
 Exec=shadps4
 Terminal=false
 Type=Application
-Icon=shadps4
-Comment=shadps4 emulator
+Icon=net.shadps4.shadps4
+Comment=PlayStation 4 emulator
 Categories=Game;
 StartupWMClass=shadps4;
diff --git a/dist/net.shadps4.shadps4.metainfo.xml b/dist/net.shadps4.shadps4.metainfo.xml
new file mode 100644
index 0000000000..754b9d62a6
--- /dev/null
+++ b/dist/net.shadps4.shadps4.metainfo.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>net.shadps4.shadps4</id>
+  <name>shadPS4</name>
+  <developer id="net.shadps4.shadps4">
+    <name>shadPS4 Contributors</name>
+    <url>https://github.com/shadps4-emu/shadps4/graphs/contributors</url>
+  </developer>
+  <summary>PS4 Emulator</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <launchable type="desktop-id">net.shadps4.shadps4.desktop</launchable>
+  <url type="homepage">https://shadps4.net/</url>
+  <icon type="remote" width="256" height="256">https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/src/images/net.shadps4.shadps4.svg</icon>
+  <description>
+    <p>shadPS4 is an early PlayStation 4 emulator for Windows, Linux and macOS written in C++.</p>
+    <p>The emulator is still early in development, so don't expect a flawless experience. Nonetheless, the emulator can already run a number of commercial games.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source">https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/1.png</image>
+      <caption>Bloodborne</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/2.png</image>
+      <caption>Hatsune Miku: Project DIVA Future Tone</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/3.png</image>
+      <caption>Yakuza Kiwami</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/4.png</image>
+      <caption>Persona 4 Golden</caption>
+    </screenshot>
+  </screenshots>
+  <categories>
+    <category>Game</category>
+  </categories>
+  <releases type="external" url="https://cdn.jsdelivr.net/gh/fpiesche/flatpak-builds/apps/net.shadps4.shadps4/net.shadps4.shadps4.releases.xml">
+    <release version="v.0.4.0" date="2024-11-03">
+      <description></description>
+    </release>
+  </releases>
+  <content_rating type="oars-1.1"/>
+  <supports>
+    <control>keyboard</control>
+  </supports>
+  <recommends>
+    <control>gamepad</control>
+  </recommends>
+  <requires>
+    <internet>offline-only</internet>
+  </requires>
+  <provides>
+    <binary>shadps4</binary>
+  </provides>
+  <keywords>
+    <keyword>emulator</keyword>
+    <keyword>emulation</keyword>
+    <keyword>playstation</keyword>
+    <keyword>ps4</keyword>
+  </keywords>
+</component>
diff --git a/dist/net.shadps4.shadps4.releases.xml b/dist/net.shadps4.shadps4.releases.xml
new file mode 100644
index 0000000000..8da203fe4b
--- /dev/null
+++ b/dist/net.shadps4.shadps4.releases.xml
@@ -0,0 +1,23 @@
+<releases>
+  <release version="0.4.0" date="2024-10-31">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.4.0</url>
+  </release>
+  <release version="0.3.0" date="2024-09-23">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.3.0</url>
+  </release>
+  <release version="0.2.0" date="2024-08-15">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.2.0</url>
+  </release>
+  <release version="0.1.0" date="2024-07-01">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/0.1.0</url>
+  </release>
+  <release version="0.0.3" date="2024-03-23">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.3</url>
+  </release>
+  <release version="0.0.2" date="2023-10-21">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.2</url>
+  </release>
+  <release version="0.0.1" date="2024-09-29">
+    <url>https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.1</url>
+  </release>
+</releases>