diff --git a/gns3-gui.appdata.xml b/gns3-gui.appdata.xml
index 30dcd43f..68e62b6d 100644
--- a/gns3-gui.appdata.xml
+++ b/gns3-gui.appdata.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Athmane Madjoudj <athmane@fedoraproject.org> -->
-<!--
-EmailAddress: athmane@fedoraproject.org
-SentUpstream: 2016-08-02
--->
-<application>
-  <id type="desktop">gns3-gui.desktop</id>
-  <metadata_license>GPLv3</metadata_license>
-  <project_license>GPLv3</project_license>
+<component type="desktop">
+  <id>gns3-gui.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>GNS3</name>
+  <summary>Graphical Network Simulator 3</summary>
   <description>
-    <p>
-     GNS3 is a graphical network simulator that allows you to design complex network
-     topologies. You may run simulations or configure devices ranging from simple
-     workstations to powerful routers.
-    </p>
+  <p>
+        GNS3 is a graphical network simulator that allows you to design complex network
+        topologies. You may run simulations or configure devices ranging from simple
+        workstations to powerful routers.
+  </p>
   </description>
-  <url type="homepage">http://www.gns3.com/</url>
-</application>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://a.fsdn.com/con/app/proj/gns-3/screenshots/127765.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>https://a.fsdn.com/con/app/proj/gns-3/screenshots/127755.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>https://a.fsdn.com/con/app/proj/gns-3/screenshots/127755.jpg</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">http://gns3.com/</url>
+  <update_contact>athmane_at_fedoraproject.org</update_contact>
+</component>