diff --git a/build/flatpak/org.gimp.GIMP-dev.json b/build/flatpak/org.gimp.GIMP-dev.json
index 674692aa27..f8f7cbdbde 100644
--- a/build/flatpak/org.gimp.GIMP-dev.json
+++ b/build/flatpak/org.gimp.GIMP-dev.json
@@ -8,7 +8,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "gimp-2.9",
     "rename-desktop-file": "gimp.desktop",
-    "rename-appdata-file": "gimp.appdata.xml",
     "rename-icon": "gimp",
     "finish-args": ["--share=ipc", "--socket=x11", "--share=network",
                     "--filesystem=host", "--filesystem=xdg-config/GIMP",
diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json
index f98029e958..210d552e38 100644
--- a/build/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/flatpak/org.gimp.GIMP-nightly.json
@@ -8,7 +8,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "gimp-2.9",
     "rename-desktop-file": "gimp.desktop",
-    "rename-appdata-file": "gimp.appdata.xml",
     "rename-icon": "gimp",
     "finish-args": ["--share=ipc", "--socket=x11", "--share=network",
                     "--filesystem=host", "--filesystem=xdg-config/GIMP",
diff --git a/configure.ac b/configure.ac
index 28cfa32d8a..577780faeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2672,6 +2672,7 @@ data/tool-presets/Selection/Makefile
 data/tool-presets/Sketch/Makefile
 desktop/Makefile
 desktop/gimp.desktop.in
+desktop/org.gimp.GIMP.appdata.xml.in
 etc/Makefile
 m4macros/Makefile
 po/Makefile.in
diff --git a/desktop/.gitignore b/desktop/.gitignore
index 19332348bd..5402b9e538 100644
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -1,6 +1,7 @@
 /Makefile.in
 /Makefile
-/gimp.appdata.xml
+/org.gimp.GIMP.appdata.xml.in
+/org.gimp.GIMP.appdata.xml
 /gimp.desktop.in
 /gimp.desktop
 /.thumbnails
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index 5c84625252..149317f604 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -3,7 +3,7 @@
 desktop_in_files = gimp.desktop.in.in
 desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
 
-appstream_in_files = gimp.appdata.xml.in gimp-data-extras.metainfo.xml.in
+appstream_in_files = org.gimp.GIMP.appdata.xml.in gimp-data-extras.metainfo.xml.in
 appstream_files = $(appstream_in_files:.xml.in=.xml)
 
 if DESKTOP_DATADIR
diff --git a/desktop/gimp.appdata.xml.in b/desktop/org.gimp.GIMP.appdata.xml.in.in
similarity index 99%
rename from desktop/gimp.appdata.xml.in
rename to desktop/org.gimp.GIMP.appdata.xml.in.in
index 502ec1b311..ea4eaa0314 100644
--- a/desktop/gimp.appdata.xml.in
+++ b/desktop/org.gimp.GIMP.appdata.xml.in.in
@@ -69,7 +69,7 @@
     <!-- Fix the ID renaming, and things like past reviews made on the
          older ID in software installers. -->
     <id>gimp.desktop</id>
-  <provides>
+  </provides>
 
   <releases>
   <!--
diff --git a/desktop/test-appdata.sh b/desktop/test-appdata.sh
index 5419aa781a..15e3a0a966 100755
--- a/desktop/test-appdata.sh
+++ b/desktop/test-appdata.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp.appdata.xml.in
+appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/org.gimp.GIMP.appdata.xml.in.in
 appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp-data-extras.metainfo.xml.in
diff --git a/devel-docs/release-howto.txt b/devel-docs/release-howto.txt
index 245e3bf312..dc89896dd3 100644
--- a/devel-docs/release-howto.txt
+++ b/devel-docs/release-howto.txt
@@ -22,8 +22,8 @@
      to sort out issues with their builds.
 
  ( ) If this is a stable release, make sure we have a <release> tag
-     inside desktop/gimp.appdata.xml.in for this upcoming version. Some
-     installers may feature more prominently software with recent
+     inside desktop/org.gimp.GIMP.appdata.xml.in for this upcoming version.
+     Some installers may feature more prominently software with recent
      releases if the appropriate tag was set (e.g. GNOME Software has a
      "Recent Releases" category).
      If a description is added, it may be featured in installers and
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1bc8868d49..7e4e565afd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 
 [encoding: UTF-8]
 
-desktop/gimp.appdata.xml.in
+desktop/org.gimp.GIMP.appdata.xml.in.in
 desktop/gimp-data-extras.metainfo.xml.in
 desktop/gimp.desktop.in.in