diff --git a/data/zathura.appdata.xml b/data/zathura.appdata.xml
index 89bb46c..0a13dba 100644
--- a/data/zathura.appdata.xml
+++ b/data/zathura.appdata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 pwmt.org -->
+<!-- Copyright 2014-2015 pwmt.org -->
 
-<application>
-  <id type="desktop">zathura.desktop</id>
+<component type="desktop">
+  <id>zathura.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>Zlib</project_license>
   <description>
@@ -23,11 +23,20 @@
     </p>
   </description>
   <url type="homepage">http://pwmt.org/projects/zathura</url>
+  <url type="bugtracker">https://bugs.pwmt.org/project/zathura</url>
   <screenshots>
-    <screenshot type="default">http://pwmt.org/projects/zathura/img/zathura-cover.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-completion.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-follow.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-bookmarks.png</screenshot>
+    <screenshot type="default">
+      <image>http://pwmt.org/projects/zathura/img/zathura-cover.png</image>
+    </screenshot>
+    <screenshot>
+      <image>http://pwmt.org/projects/zathura/img/zathura-completion.png</image>
+    </screenshot>
+    <screenshot>
+      <image>http://pwmt.org/projects/zathura/img/zathura-follow.png</image>
+    </screenshot>
+    <screenshot>
+      <image>http://pwmt.org/projects/zathura/img/zathura-bookmarks.png</image>
+    </screenshot>
   </screenshots>
-  <updatecontact>zathura@lists.pwmt.org</updatecontact>
-</application>
+  <update_contact>zathura@lists.pwmt.org</update_contact>
+</component>