diff --git a/.gitignore b/.gitignore
index 40ec2eaaf..4a0624281 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ core
 *.desktop.in
 *.service
 *.policy
-thunar.appdata.xml
+org.xfce.thunar.appdata.xml
 gtk-doc.make
 ThunarBulkRename
 Thunar.spec
diff --git a/Makefile.am b/Makefile.am
index befedfb3c..94c8f3eb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,9 +74,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 # .appdata
 #
 @INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = thunar.appdata.xml.in
+appdata_in_files = org.xfce.thunar.appdata.xml.in
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in org.xfce.Thunar.service.in
diff --git a/thunar.appdata.xml.in b/org.xfce.thunar.appdata.xml.in
similarity index 73%
rename from thunar.appdata.xml.in
rename to org.xfce.thunar.appdata.xml.in
index cf6903cd8..64a135773 100644
--- a/thunar.appdata.xml.in
+++ b/org.xfce.thunar.appdata.xml.in
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
 
-<application>
-  <id type="desktop">Thunar.desktop</id>
+<component type="desktop-application">
+  <id type="desktop">org.xfce.Thunar</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <name>Thunar</name>
   <summary>File Browser</summary>
   <description>
     <_p>
@@ -20,5 +22,11 @@
     <screenshot type="default">http://docs.xfce.org/_media/xfce/thunar/file-manager-window.png</screenshot>
   </screenshots>
 
+  <categories>
+    <category>System</category>
+  </categories>
+
+  <project_group>Xfce</project_group>
   <updatecontact>xfce4-dev@xfce.org</updatecontact>
-</application>
+  <translation type="gettext">Thunar</translation>
+</component>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1317d3285..80080d1c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -127,5 +127,5 @@ Thunar.desktop.in.in
 Thunar-bulk-rename.desktop.in.in
 Thunar-folder-handler.desktop.in.in
 thunar/thunar-settings.desktop.in
-thunar.appdata.xml.in
+org.xfce.thunar.appdata.xml.in
 org.xfce.thunar.policy.in.in