diff --git a/supertux2.appdata.xml b/supertux2.appdata.xml
index 170c8fb92db..e1d9f79dd35 100644
--- a/supertux2.appdata.xml
+++ b/supertux2.appdata.xml
@@ -1,21 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 William Moreno Reyes <williamjmorenor@fedoraproject.org> -->
-
-<application>
-  <id type="desktop">supertux2.desktop</id>
+<component type="desktop-application">
+  <id>org.supertuxproject.SuperTux</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <summary>Run and jump game similar to Super Mario</summary>
+  <project_license>GPL-3.0+ AND CC-BY-SA-2.0</project_license>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">mild</content_attribute>
+    <content_attribute id="language-humor">mild</content_attribute>
+  </content_rating>
+  <name>SuperTux</name>
+  <summary>A jump-and-run game starring Tux the Penguin</summary>
   <description>
     <p>
-      SuperTux is a 2D game very similar to Super Mario with Tux Penguin as
-      protagonist, you must end each level by jumping and running to avoid
-      obstacles and enemies.
+      Run and jump through multiple worlds, fight off enemies by
+      jumping on them, bumping them from below or tossing objects at
+      them, grabbing power-ups and other stuff on the way.
+    </p>
+    <p>
+      In addition to the Story Mode, there is a large amount of
+      community contributed levels available as add-ons or in the
+      forums. Everyone can contribute such content by using the
+      integrated level editor.
     </p>
   </description>
+  <developer_name>The SuperTux Team</developer_name>
+  <update_contact>supertux-devel@lists.lethargik.org</update_contact>
   <url type="homepage">http://supertux.lethargik.org/</url>
+  <url type="bugtracker">https://github.com/SuperTux/supertux/issues</url>
+  <categories>
+    <category>Game</category>
+    <category>ActionGame</category>
+    <category>ArcadeGame</category>
+  </categories>
   <screenshots>
-    <screenshot type="default">http://supertux.lethargik.org/images/supertux-0.1.3-5.jpg</screenshot>
-    <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-1.jpg</screenshot>
-    <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-2.jpg</screenshot>
+    <screenshot type="default">https://www.supertux.org/images/0_4_0/0_4_0_1.png</screenshot>
+    <screenshot>https://www.supertux.org/images/0_4_0/0_4_0_5.png</screenshot>
+    <screenshot>https://www.supertux.org/images/0_4_0/0_4_0_6.png</screenshot>
+    <screenshot>https://www.supertux.org/images/0_4_0/0_4_0_9.png</screenshot>
+    <screenshot>https://www.supertux.org/images/0_4_0/0_4_0_10.png</screenshot>
   </screenshots>
-</application>
+  <launchable type="desktop-id">supertux2.desktop</launchable>
+  <provides>
+    <binary>supertux2</binary>
+  </provides>
+</component>