diff --git a/src/Cutter.pro b/src/Cutter.pro
index d33b7ba3..8de8e26f 100644
--- a/src/Cutter.pro
+++ b/src/Cutter.pro
@@ -374,20 +374,25 @@ unix {
     share_pixmaps.files = $$icon_file
 
 
-    desktop_file = Cutter.desktop
+    desktop_file = org.radare.Cutter.desktop
 
     share_applications.path = $$PREFIX/share/applications
     share_applications.files = $$desktop_file
 
-    appstream_file = Cutter.appdata.xml
+    appstream_file = org.radare.Cutter.appdata.xml
 
+    # Used by ???
     share_appdata.path = $$PREFIX/share/appdata
     share_appdata.files = $$appstream_file
 
+    # Used by AppImageHub (See https://www.freedesktop.org/software/appstream)
+    share_appdata.path = $$PREFIX/share/metainfo
+    share_appdata.files = $$appstream_file
+
     # built-in no need for files atm
     target.path = $$PREFIX/bin
 
-    INSTALLS += target share_appdata share_applications share_pixmaps
+    INSTALLS += target share_appdata share_metadata share_applications share_pixmaps
 
     # Triggered for example by 'qmake APPIMAGE=1'
     !isEmpty(APPIMAGE){
diff --git a/src/Cutter.appdata.xml b/src/org.radare.Cutter.appdata.xml
similarity index 60%
rename from src/Cutter.appdata.xml
rename to src/org.radare.Cutter.appdata.xml
index 2c4ba8f0..3dae6e1b 100644
--- a/src/Cutter.appdata.xml
+++ b/src/org.radare.Cutter.appdata.xml
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>Cutter.desktop</id>
+  <id>org.radare.Cutter</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>Cutter</name>
   <summary>A Qt and C++ GUI for radare2 reverse engineering framework</summary>
+
   <description>
     <p>
-      Cutter is Qt and C++ GUI for radare2, originally named Iaito. It is not aimed at existing radare2 users, but focuses on those whose aren’t fluent yet with the command line, likely because of the steep learning curve.
+      Cutter is a free and open-source GUI for radare2. Willing to create an advanced, customizable and free reverse engineering framework.
     </p>
   </description>
+
+  <launchable type="desktop-id">org.radare.Cutter.desktop</launchable>
+
   <screenshots>
     <screenshot>
-      <image>https://raw.githubusercontent.com/radareorg/cutter/master/docs/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/radareorg/cutter/master/docs/images/screenshot.png</image>
       <caption>Main UI</caption>
     </screenshot>
-    <screenshot>
-      <image>http://beta.rada.re/en/latest/_images/cutter.png</image>
-      <caption>Light Theme</caption>
-    </screenshot>
-    <screenshot>
-      <image>http://beta.rada.re/en/latest/_images/cutter_dark.jpg</image>
-      <caption>Dark Theme</caption>
-    </screenshot>
   </screenshots>
-  <url type="homepage">http://beta.rada.re/en/latest/cutter.html</url>
+
+  <url type="homepage">https://radareorg.github.io/cutter/</url>
+  <update_contact>xarkes</update_contact>
+
   <releases>
     <release version="1.7.2" date="2018-10-07" />
     <release version="1.7.1" date="2018-08-25" />
diff --git a/src/Cutter.desktop b/src/org.radare.Cutter.desktop
similarity index 100%
rename from src/Cutter.desktop
rename to src/org.radare.Cutter.desktop