diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff12bf8769..d69352c949 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,12 +395,12 @@ configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb.txt
     "${OpenMW_BINARY_DIR}" "gamecontrollerdb.txt")
 
 if (NOT WIN32 AND NOT APPLE)
-    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop
-        "${OpenMW_BINARY_DIR}/openmw.desktop")
+    configure_file(${OpenMW_SOURCE_DIR}/files/org.openmw.launcher.desktop
+        "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop")
     configure_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
         "${OpenMW_BINARY_DIR}/openmw.appdata.xml")
-    configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.desktop
-        "${OpenMW_BINARY_DIR}/openmw-cs.desktop")
+    configure_file(${OpenMW_SOURCE_DIR}/files/org.openmw.cs.desktop
+        "${OpenMW_BINARY_DIR}/org.openmw.cs.desktop")
 endif()
 
 # CXX Compiler settings
@@ -474,11 +474,11 @@ IF(NOT WIN32 AND NOT APPLE)
     INSTALL(FILES "files/mygui/DejaVu Font License.txt" DESTINATION "${LICDIR}" )
 
     # Install icon and desktop file
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.appdata.xml" DESTINATION "${DATAROOTDIR}/metainfo" COMPONENT "openmw")
     IF(BUILD_OPENCS)
-        INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "opencs")
+        INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.cs.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "opencs")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/openmw-cs.png" DESTINATION "${ICONDIR}" COMPONENT "opencs")
     ENDIF(BUILD_OPENCS)
 
diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index 8271ab6ebb..edbeb1a275 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright 2015 Alexandre Moine <nobrakal@gmail.com>
-Copyright 2018 Bret Curtis <psi29a@gmail.com>
+Copyright 2020 Bret Curtis <psi29a@gmail.com>
 -->
 <component type="desktop">
- <id>org.openmw.desktop</id>
+ <id>org.openmw.launcher.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-3.0 and MIT</project_license>
  <name>OpenMW</name>
@@ -20,6 +20,7 @@ Copyright 2018 Bret Curtis <psi29a@gmail.com>
   You will still need the original game data to play OpenMW.
   </p>
  </description>
+ <launchable type="desktop-id">org.openmw.launcher.desktop</launchable>
  <screenshots>
   <screenshot type="default">
    <image>https://wiki.openmw.org/images/b/b2/Openmw_0.11.1_launcher_1.png</image>
diff --git a/files/openmw-cs.desktop b/files/org.openmw.cs.desktop
similarity index 100%
rename from files/openmw-cs.desktop
rename to files/org.openmw.cs.desktop
diff --git a/files/openmw.desktop b/files/org.openmw.launcher.desktop
similarity index 100%
rename from files/openmw.desktop
rename to files/org.openmw.launcher.desktop