diff --git a/.tx/config b/.tx/config
index 14d71d5e95..2b8d3296e9 100644
--- a/.tx/config
+++ b/.tx/config
@@ -11,7 +11,7 @@ minimum_perc = 23
 mode = developer
 
 [qbittorrent.qbittorrentdesktop_master]
-source_file = dist/unix/qbittorrent.desktop
+source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23
diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt
index edf0d92162..26b4bea7db 100644
--- a/dist/unix/CMakeLists.txt
+++ b/dist/unix/CMakeLists.txt
@@ -31,12 +31,12 @@ if (Qt5Widgets_FOUND)
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
 
-    install(FILES qbittorrent.desktop
+    install(FILES org.qbittorrent.qBittorrent.desktop
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
             COMPONENT data)
 
-    install(FILES qbittorrent.appdata.xml
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
+    install(FILES org.qbittorrent.qBittorrent.appdata.xml
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/
             COMPONENT data)
 
     install(FILES
diff --git a/dist/unix/qbittorrent.appdata.xml b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml
similarity index 100%
rename from dist/unix/qbittorrent.appdata.xml
rename to dist/unix/org.qbittorrent.qBittorrent.appdata.xml
diff --git a/dist/unix/qbittorrent.desktop b/dist/unix/org.qbittorrent.qBittorrent.desktop
similarity index 100%
rename from dist/unix/qbittorrent.desktop
rename to dist/unix/org.qbittorrent.qBittorrent.desktop
diff --git a/unixconf.pri b/unixconf.pri
index 89d5d1426c..fa059c0df0 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -35,12 +35,12 @@ nogui:systemd {
 
 # Menu Icon
 !nogui {
-    menuicon.files = $$DIST_PATH/qbittorrent.desktop
+    menuicon.files = $$DIST_PATH/org.qbittorrent.qBittorrent.desktop
     menuicon.path = $$DATADIR/applications/
     INSTALLS += menuicon
 
-    appdata.files = $$DIST_PATH/qbittorrent.appdata.xml
-    appdata.path = $$DATADIR/appdata/
+    appdata.files = $$DIST_PATH/org.qbittorrent.qBittorrent.appdata.xml
+    appdata.path = $$DATADIR/metainfo/
     INSTALLS += appdata
 
     # Apps icons