diff --git a/.gitignore b/.gitignore
index 70d0535..259f252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,7 @@ src/include/lib3270
 vgcore.*
 gschemas.compiled
 *.gschema.xml
-appdata.xml
+metainfo.xml
 *.metainfo.xml
 
 *.[0-9]
diff --git a/branding/Makefile.in b/branding/Makefile.in
index 6549849..9dc3775 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -101,7 +101,7 @@ endif
 validate:
 
 ifneq ($(SCOUR),no)
-	@$(APPSTREAMCLI) validate appdata.xml
+	@$(APPSTREAMCLI) validate metainfo.xml
 endif
 
 
@@ -128,10 +128,10 @@ install-linux: \
 		mime.xml \
 		$(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml
 
-	@$(MKDIR) $(DESTDIR)$(datarootdir)/appdata
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/metainfo
 	@$(INSTALL_DATA) \
-		appdata.xml \
-		$(DESTDIR)$(datarootdir)/appdata/$(APPLICATION_ID).appdata.xml
+		metainfo.xml \
+		$(DESTDIR)$(datarootdir)/metainfo/$(APPLICATION_ID).metainfo.xml
 
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
 	@$(INSTALL_DATA) \
diff --git a/branding/appdata.xml.in b/branding/appdata.xml.in
deleted file mode 100644
index 431337a..0000000
--- a/branding/appdata.xml.in
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-	References: 
-
-		https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
-		https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf
-		https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/
-
--->
-
-<component type="desktop">
-
-	<id>@APPLICATION_ID@.desktop</id>
-
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>LGPL-3.0</project_license>
-
-	<name>@PRODUCT_NAME@</name>
-	<name xml:lang="pt_BR">@PRODUCT_NAME@</name>
-
-	<summary>IBM 3270 Terminal emulator</summary>
-	<summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
-
-	<developer_name>Perry Werneck</developer_name>
-
-	<description>
-		<p>GTK Based 3270 terminal emulator</p>
-		<p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>
-		<p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
-	</description>
-
-	<description xml:lang="pt_BR">
-		<p>Emulador de terminal 3270 baseado em GTK-3</p>
-		<p>@PRODUCT_NAME@ é um emulador tn3270 moderno, baseado em GTK e completamente livre.</p>
-		<p>Criado originalmente para o Banco do Brasil, agora é um projeto de software público do governo brasileiro usado em todo o mundo.</p>
-	</description>
-
-	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
-	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
-
-	<screenshots>
-		<screenshot type="default">
-			<caption>Acessing MVS with @PRODUCT_NAME@</caption>
-			<caption xml:lang="pt_BR">@PRODUCT_NAME@ acessando MVS</caption>
-			<image>https://raw.githubusercontent.com/PerryWerneck/PerryWerneck/master/screenshots/mvs-tk4.png</image>
-		</screenshot>
-	</screenshots>
-
-	<update_contact>perry.werneck@gmail.com</update_contact>
-
-	<project_group>GNOME</project_group>
-
-	<provides>
-		<binary>@PRODUCT_NAME@</binary>
-	</provides>
-
-	<translation type="gettext">@PRODUCT_NAME@</translation>
-
-</component>
diff --git a/branding/metainfo.xml.in b/branding/metainfo.xml.in
new file mode 100644
index 0000000..1644de4
--- /dev/null
+++ b/branding/metainfo.xml.in
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+	References:
+
+		https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
+		https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf
+		https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/
+
+-->
+
+<component type="desktop-application">
+
+	<id>@APPLICATION_ID@</id>
+
+	<metadata_license>CC0-1.0</metadata_license>
+	<project_license>LGPL-3.0</project_license>
+	<content_rating type="oars-1.1" />
+
+	<name>@PRODUCT_NAME@</name>
+	<name xml:lang="pt_BR">@PRODUCT_NAME@</name>
+
+	<summary>IBM 3270 Terminal emulator</summary>
+	<summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
+
+	<developer_name>Perry Werneck</developer_name>
+
+	<description>
+		<p>GTK Based 3270 terminal emulator</p>
+		<p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>
+		<p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
+	</description>
+
+	<description xml:lang="pt_BR">
+		<p>Emulador de terminal 3270 baseado em GTK-3</p>
+		<p>@PRODUCT_NAME@ é um emulador tn3270 moderno, baseado em GTK e completamente livre.</p>
+		<p>Criado originalmente para o Banco do Brasil, agora é um projeto de software público do governo brasileiro usado em todo o mundo.</p>
+	</description>
+
+	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
+	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
+
+	<launchable type="desktop-id">@APPLICATION_ID@.desktop</launchable>
+
+	<screenshots>
+		<screenshot type="default">
+			<caption>Acessing MVS with @PRODUCT_NAME@</caption>
+			<caption xml:lang="pt_BR">@PRODUCT_NAME@ acessando MVS</caption>
+			<image>https://raw.githubusercontent.com/PerryWerneck/PerryWerneck/master/screenshots/mvs-tk4.png</image>
+		</screenshot>
+	</screenshots>
+
+	<update_contact>perry.werneck@gmail.com</update_contact>
+
+	<provides>
+		<binary>@PRODUCT_NAME@</binary>
+	</provides>
+
+	<translation type="gettext">@PRODUCT_NAME@</translation>
+
+	<releases>
+		<release version="@VERSION@"/>
+	</releases>
+</component>
diff --git a/configure.ac b/configure.ac
index 32a4dd3..d8285d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ AC_CONFIG_FILES(locale/Makefile)
 AC_CONFIG_FILES(branding/Makefile)
 AC_CONFIG_FILES(branding/launcher.desktop)
 AC_CONFIG_FILES(branding/mime.xml)
-AC_CONFIG_FILES(branding/appdata.xml)
+AC_CONFIG_FILES(branding/metainfo.xml)
 dnl AC_CONFIG_FILES(branding/keypad.metainfo.xml)
 
 dnl ---------------------------------------------------------------------------
diff --git a/rpm/pw3270.spec b/rpm/pw3270.spec
index f3a49d9..ee931bd 100644
--- a/rpm/pw3270.spec
+++ b/rpm/pw3270.spec
@@ -142,7 +142,7 @@ make all -j1
 
 %find_lang pw3270 langfiles
 
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
 
 %fdupes %{buildroot}/%{_prefix}
 
@@ -162,7 +162,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
 
 # Desktop files
 %{_datadir}/applications/*.desktop
-%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/metainfo/*.metainfo.xml
 
 # Icons
 %{_datadir}/%{_product}/icons/*.svg
diff --git a/validate-appdata.sh b/validate-appdata.sh
deleted file mode 100755
index 7c4f587..0000000
--- a/validate-appdata.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-./configure
-
-cp branding/appdata.xml /tmp/pw3270.appdata.xml
-appstream-util validate /tmp/pw3270.appdata.xml
-
diff --git a/validate-metainfo.sh b/validate-metainfo.sh
new file mode 100755
index 0000000..09338c2
--- /dev/null
+++ b/validate-metainfo.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+./configure
+
+cp branding/metainfo.xml /tmp/pw3270.metainfo.xml
+appstream-util validate /tmp/pw3270.metainfo.xml
+
--
libgit2 0.21.2