diff --git a/dist/copr/tiled.spec b/dist/copr/tiled.spec
index fda7c3564c..cf788a8b18 100644
--- a/dist/copr/tiled.spec
+++ b/dist/copr/tiled.spec
@@ -112,7 +112,7 @@ make install INSTALL_ROOT=%{buildroot}
 find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf
 
 # Validate desktop file
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{app_id}.desktop
 
 # Appdata
 install -D -p -m644 %{app_id}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{app_id}.appdata.xml
@@ -150,10 +150,10 @@ fi
 %{_bindir}/terraingenerator
 %{_bindir}/tmxrasterizer
 %{_bindir}/tmxviewer
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{app_id}.desktop
 %{_datadir}/icons/hicolor/*/apps/*%{name}*
 %{_datadir}/icons/hicolor/*/mimetypes/*%{name}*
-%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mime/packages/%{app_id}.xml
 %{_datadir}/thumbnailers/%{name}.thumbnailer
 %{_datadir}/appdata/%{app_id}.appdata.xml
 %dir %{_datadir}/%{name}/
diff --git a/mime/tiled.xml b/mime/org.mapeditor.Tiled.xml
similarity index 100%
rename from mime/tiled.xml
rename to mime/org.mapeditor.Tiled.xml
diff --git a/org.mapeditor.Tiled.appdata.xml b/org.mapeditor.Tiled.appdata.xml
index 3179fb10d2..40c2e4362c 100644
--- a/org.mapeditor.Tiled.appdata.xml
+++ b/org.mapeditor.Tiled.appdata.xml
@@ -40,7 +40,7 @@
    <kudo>UserDocs</kudo>
  </kudos>
  <url type="homepage">http://www.mapeditor.org/</url>
- <launchable type="desktop-id">tiled.desktop</launchable>
+ <launchable type="desktop-id">org.mapeditor.Tiled.desktop</launchable>
  <provides>
    <id>tiled.desktop</id>
  </provides>
diff --git a/tiled.desktop b/org.mapeditor.Tiled.desktop
similarity index 100%
rename from tiled.desktop
rename to org.mapeditor.Tiled.desktop
diff --git a/src/tiled/tiled.pro b/src/tiled/tiled.pro
index a6d5ab4b28..145be47f44 100644
--- a/src/tiled/tiled.pro
+++ b/src/tiled/tiled.pro
@@ -503,7 +503,7 @@ mimeiconscalable.files += images/scalable/application-x-tiled.svg
 INSTALLS += mimeiconscalable
 
 mimeinfofile.path = $${PREFIX}/share/mime/packages/
-mimeinfofile.files += ../../mime/tiled.xml
+mimeinfofile.files += ../../mime/org.mapeditor.Tiled.xml
 INSTALLS += mimeinfofile
 
 thumbnailgenerator.path = $${PREFIX}/share/thumbnailers/
@@ -511,7 +511,7 @@ thumbnailgenerator.files += ../../mime/tiled.thumbnailer
 INSTALLS += thumbnailgenerator
 
 desktopfile.path = $${PREFIX}/share/applications/
-desktopfile.files += ../../tiled.desktop
+desktopfile.files += ../../org.mapeditor.Tiled.desktop
 INSTALLS += desktopfile
 
 appdatafile.path = $${PREFIX}/share/metainfo/
diff --git a/src/tiled/tiled.qbs b/src/tiled/tiled.qbs
index b2a1bc8752..924140db6d 100644
--- a/src/tiled/tiled.qbs
+++ b/src/tiled/tiled.qbs
@@ -578,7 +578,7 @@ QtGuiApplication {
         condition: qbs.targetOS.contains("linux")
         qbs.install: true
         qbs.installDir: "share/applications"
-        files: [ "../../tiled.desktop" ]
+        files: [ "../../org.mapeditor.Tiled.desktop" ]
     }
 
     Group {
@@ -602,7 +602,7 @@ QtGuiApplication {
         condition: qbs.targetOS.contains("linux")
         qbs.install: true
         qbs.installDir: "share/mime/packages"
-        files: [ "../../mime/tiled.xml" ]
+        files: [ "../../mime/org.mapeditor.Tiled.xml" ]
     }
 
     Group {