diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3920257d5e7f..9f14c5282cbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	message ("Installing desktop files")
 
 	# Install icons
-	install(FILES ui/pixmaps/xournalpp.svg
+	install(FILES ui/pixmaps/com.github.xournalpp.xournalpp.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
 
 	# Symlink are not easy to use with CMake, therefor simple install a copy...
@@ -248,9 +248,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	install(FILES ui/pixmaps/gnome-mime-application-x-xopt.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/)
 
-	install(FILES desktop/xournalpp.xml
+	install(FILES desktop/com.github.xournalpp.xournalpp.xml
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages)
-	install(FILES desktop/xournalpp.desktop
+	install(FILES desktop/com.github.xournalpp.xournalpp.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
 	install(FILES desktop/x-xojpp.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/application)
@@ -259,10 +259,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	install(FILES desktop/x-xopt.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/application)
 
-	install(FILES desktop/xournalpp.thumbnailer
+	install(FILES desktop/com.github.xournalpp.xournalpp.thumbnailer
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/thumbnailers)
 
-	install(FILES desktop/xournalpp.appdata.xml
+	install(FILES desktop/com.github.xournalpp.xournalpp.appdata.xml
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
 
 	# TODO: Only package post install scripts with distro-specific packages
diff --git a/desktop/xournalpp.appdata.xml b/desktop/com.github.xournalpp.xournalpp.appdata.xml
similarity index 93%
rename from desktop/xournalpp.appdata.xml
rename to desktop/com.github.xournalpp.xournalpp.appdata.xml
index 04a169474257..fb0d4c2b8cd9 100644
--- a/desktop/xournalpp.appdata.xml
+++ b/desktop/com.github.xournalpp.xournalpp.appdata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Tobias Mueller <tobiasmue@gnome.org>  -->
 <component type="desktop">
-  <id>xournalpp.desktop</id>
+  <id>com.github.xournalpp.xournalpp</id>
   <translation type="gettext">xournalpp</translation>
   <name>Xournal++</name>
   <summary>Take handwritten notes</summary>
@@ -62,7 +63,10 @@
       <image>https://i.imgur.com/3uxu40d.png</image>
     </screenshot>
   </screenshots>
-  <launchable type="desktop-id">@app-id@.desktop</launchable>
+  <launchable type="desktop-id">com.github.xournalpp.xournalpp.desktop</launchable>
+  <provides>
+    <id>xournalpp.desktop</id>
+  </provides>
   <update_contact>webmaster_AT_huberulrich.de</update_contact>
   <content_rating type="oars-1.0"/>
   <releases>
diff --git a/desktop/xournalpp.desktop b/desktop/com.github.xournalpp.xournalpp.desktop
similarity index 95%
rename from desktop/xournalpp.desktop
rename to desktop/com.github.xournalpp.xournalpp.desktop
index 9ea399f5a8ee..95de8678dd06 100644
--- a/desktop/xournalpp.desktop
+++ b/desktop/com.github.xournalpp.xournalpp.desktop
@@ -23,5 +23,5 @@ Exec=xournalpp %f
 Terminal=false
 StartupNotify=true
 MimeType=application/x-xoj;application/x-xojpp;application/x-xopp;application/x-xopt;application/pdf;
-Icon=xournalpp
+Icon=com.github.xournalpp.xournalpp
 Categories=Office;GNOME;GTK;
diff --git a/desktop/xournalpp.thumbnailer b/desktop/com.github.xournalpp.xournalpp.thumbnailer
similarity index 100%
rename from desktop/xournalpp.thumbnailer
rename to desktop/com.github.xournalpp.xournalpp.thumbnailer
diff --git a/desktop/xournalpp.xml b/desktop/com.github.xournalpp.xournalpp.xml
similarity index 100%
rename from desktop/xournalpp.xml
rename to desktop/com.github.xournalpp.xournalpp.xml
diff --git a/ui/pixmaps/xournalpp.png b/ui/pixmaps/com.github.xournalpp.xournalpp.png
similarity index 100%
rename from ui/pixmaps/xournalpp.png
rename to ui/pixmaps/com.github.xournalpp.xournalpp.png
diff --git a/ui/pixmaps/xournalpp.svg b/ui/pixmaps/com.github.xournalpp.xournalpp.svg
similarity index 100%
rename from ui/pixmaps/xournalpp.svg
rename to ui/pixmaps/com.github.xournalpp.xournalpp.svg