diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index 04e432d0ba..5c84625252 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -3,10 +3,8 @@
 desktop_in_files = gimp.desktop.in.in
 desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
 
-appdata_in_files = gimp.appdata.xml.in
-appdata_files = \
-	$(appdata_in_files:.appdata.xml.in=.appdata.xml) \
-	gimp-data-extras.metainfo.xml
+appstream_in_files = gimp.appdata.xml.in gimp-data-extras.metainfo.xml.in
+appstream_files = $(appstream_in_files:.xml.in=.xml)
 
 if DESKTOP_DATADIR
 
@@ -14,7 +12,7 @@ applicationsdir = $(DESKTOP_DATADIR)/applications
 applications_DATA = $(desktop_files)
 
 appdatadir = $(DESKTOP_DATADIR)/appdata
-appdata_DATA = $(appdata_files)
+appdata_DATA = $(appstream_files)
 
 icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
 icons16_DATA = 16x16/gimp.png
@@ -42,19 +40,19 @@ install-data-hook:
 endif
 
 EXTRA_DIST = \
-	$(appdata_in_files)	\
-	test-appdata.sh		\
-	gimp.desktop.in.in	\
-	16x16/gimp.png		\
-	22x22/gimp.png		\
-	24x24/gimp.png		\
-	32x32/gimp.png		\
-	48x48/gimp.png		\
-	64x64/gimp.png		\
+	$(appstream_in_files) \
+	test-appdata.sh       \
+	gimp.desktop.in.in    \
+	16x16/gimp.png        \
+	22x22/gimp.png        \
+	24x24/gimp.png        \
+	32x32/gimp.png        \
+	48x48/gimp.png        \
+	64x64/gimp.png        \
 	256x256/gimp.png
 
 
-DISTCLEANFILES = $(desktop_files) $(appdata_files)
+DISTCLEANFILES = $(desktop_files) $(appstream_files)
 
 @INTLTOOL_XML_RULE@
 
diff --git a/desktop/gimp-data-extras.metainfo.xml b/desktop/gimp-data-extras.metainfo.xml
deleted file mode 100644
index 0a741340d7..0000000000
--- a/desktop/gimp-data-extras.metainfo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Jiri Eischmann <eischmann@redhat.com> 
--->
-<component type="addon">
-<id>gimp-data-extras</id>
-<extends>gimp.desktop</extends>
-<name>Extra files for GIMP</name>
-<summary>Patterns, gradients, and other extra files for GIMP</summary>
-<url type="homepage">http://www.gimp.org/</url>
-<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP</url>
-<metadata_license>CC0-1.0</metadata_license>
-<project_license>GPL-3.0+</project_license>
-<updatecontact>alexandre.prokoudine@gmail.com</updatecontact>
-​</component>
\ No newline at end of file
diff --git a/desktop/gimp-data-extras.metainfo.xml.in b/desktop/gimp-data-extras.metainfo.xml.in
new file mode 100644
index 0000000000..0d7cc39594
--- /dev/null
+++ b/desktop/gimp-data-extras.metainfo.xml.in
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Jiri Eischmann <eischmann@redhat.com> -->
+<component type="addon">
+  <id>gimp-data-extras</id>
+  <extends>gimp.desktop</extends>
+  <_name>Extra files for GIMP</_name>
+  <_summary>Patterns, gradients, and other extra files for GIMP</_summary>
+  <url type="homepage">http://www.gimp.org/</url>
+  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP</url>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <update_contact>alexandre.prokoudine@gmail.com</update_contact>
+</component>
diff --git a/desktop/test-appdata.sh b/desktop/test-appdata.sh
index e263b70b17..5419aa781a 100755
--- a/desktop/test-appdata.sh
+++ b/desktop/test-appdata.sh
@@ -1,3 +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/gimp-data-extras.metainfo.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6e6327db1b..1dd6dc72e0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@
 [encoding: UTF-8]
 
 desktop/gimp.appdata.xml.in
+desktop/gimp-data-extras.metainfo.xml.in
 desktop/gimp.desktop.in.in
 
 app/about.h