diff --git a/data/supertuxkart.appdata.xml b/data/supertuxkart.appdata.xml
index 412961b51..b331807c8 100644
--- a/data/supertuxkart.appdata.xml
+++ b/data/supertuxkart.appdata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-
-<application>
-  <id type="desktop">supertuxkart.desktop</id>
+<component type="desktop">
+  <id>supertuxkart.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
   <name>SuperTuxKart</name>
   <summary>A racing game</summary>
   <description>
@@ -25,11 +25,25 @@
       against the computer or your friends, and more!
     </p>
   </description>
-  <url type="homepage">http://supertuxkart.net/</url>
   <screenshots>
-    <screenshot type="default">http://supertuxkart.sourceforge.net/persistent/images/4/4e/Supertuxkart-0.9-screenshot-2.jpg</screenshot>
-    <screenshot>http://supertuxkart.sourceforge.net/persistent/images/a/a9/Supertuxkart-0.9-screenshot-1.jpg</screenshot>
-    <screenshot>http://supertuxkart.sourceforge.net/persistent/images/6/63/Supertuxkart-0.9-screenshot-3.jpg</screenshot>
+    <screenshot type="default">
+      <image>https://supertuxkart.net/images/8/83/Supertuxkart-0.9.2-screenshot-3.jpg</image>
+      <caption>Normal Race</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://supertuxkart.net/images/1/1f/Supertuxkart-0.9.2-screenshot-1.jpg</image>
+      <caption>Battle Mode</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://supertuxkart.net/images/2/2a/Supertuxkart-0.9.2-screenshot-2.jpg</image>
+      <caption>Soccer Mode</caption>
+    </screenshot>
   </screenshots>
-  <updatecontact>supertuxkart-devel@lists.sourceforge.net</updatecontact>
-</application>
+  <developer_name>SuperTuxKart Team</developer_name>
+  <update_contact>supertuxkart-devel@lists.sourceforge.net</update_contact>
+  <url type="homepage">https://supertuxkart.net</url>
+  <url type="bugtracker">https://github.com/supertuxkart/stk-code/issues</url>
+  <url type="donation">https://supertuxkart.net/Donate</url>
+  <url type="help">https://supertuxkart.net/Community</url>
+  <url type="translate">https://supertuxkart.net/Translating_STK</url>
+</component>