diff --git a/Pinta.Install.proj b/Pinta.Install.proj
index b5b985764..bca73b4e4 100644
--- a/Pinta.Install.proj
+++ b/Pinta.Install.proj
@@ -234,6 +234,7 @@
     <MakeDir Directories="$(BinDir)" />
     <Copy SourceFiles="$(OutputPath)/locale/%(Translation.Code)/LC_MESSAGES/pinta.mo" DestinationFolder="$(LocaleDir)/%(Translation.Code)/LC_MESSAGES" />
     <Copy SourceFiles="xdg/pinta.1" DestinationFolder="$(ManDir)/man1" />
+    <Copy SourceFiles="xdg/pinta.appdata.xml" DestinationFolder="$(DataRootDir)/metainfo" />
     <Copy SourceFiles="xdg/pinta.desktop" DestinationFolder="$(DataRootDir)/applications" />
     <Copy SourceFiles="xdg/pinta.xpm" DestinationFolder="$(DataRootDir)/pixmaps" />
     <Copy SourceFiles="xdg/16x16/pinta.png" DestinationFolder="$(DataRootDir)/icons/hicolor/16x16/apps" />
@@ -252,6 +253,7 @@
     <Delete Files="$(LocaleDir)/%(Translation.Code)/LC_MESSAGES/pinta.mo" />
     <Delete Files="$(ManDir)/man1/pinta.1" />
     <Delete Files="$(ManDir)/man1/pinta.1.gz" />
+    <Delete Files="$(DataRootDir)/metainfo/pinta.appdata.xml" />
     <Delete Files="$(DataRootDir)/applications/pinta.desktop" />
     <Delete Files="$(DataRootDir)/pixmaps/pinta.xpm" />
     <Delete Files="$(DataRootDir)/icons/hicolor/16x16/apps/pinta.png" />
diff --git a/xdg/pinta.appdata.xml.in b/xdg/pinta.appdata.xml.in
index 2bb76beb2..e6d9dc0bb 100644
--- a/xdg/pinta.appdata.xml.in
+++ b/xdg/pinta.appdata.xml.in
@@ -16,25 +16,9 @@
     </_p>
   </description>
   <launchable type="desktop-id">pinta.desktop</launchable>
-  <categories>
-    <category>Graphics</category>
-    <category>2DGraphics</category>
-    <category>RasterGraphics</category>
-    <category>GTK</category>
-  </categories>
-  <keywords>
-    <keyword>draw</keyword>
-    <keyword>drawing</keyword>
-    <keyword>paint</keyword>
-    <keyword>painting</keyword>
-    <keyword>graphics</keyword>
-    <keyword>raster</keyword>
-    <keyword>2d</keyword>
-  </keywords>
   <kudos>
     <kudo>HiDpiIcon</kudo>
     <kudo>HighContrast</kudo>
-    <kudo>UserDocs</kudo>
   </kudos>
   <screenshots>
     <screenshot type="default">
diff --git a/xdg/pinta.desktop.in b/xdg/pinta.desktop.in
index 5a9e4fe70..d4e000033 100644
--- a/xdg/pinta.desktop.in
+++ b/xdg/pinta.desktop.in
@@ -1,12 +1,16 @@
 [Desktop Entry]
+Version=1.0
 _Name=Pinta
 _Comment=Easily create and edit images
 _GenericName=Image Editor
 _X-GNOME-FullName=Pinta Image Editor
+TryExec=pinta
 Exec=pinta %F
 Icon=pinta
 StartupNotify=false
+StartupWMClass=Pinta
 Terminal=false
 Type=Application
 Categories=Graphics;2DGraphics;RasterGraphics;GTK;
+_Keywords=draw;drawing;paint;painting;graphics;raster;2d;
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/svg+xml;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-targa;image/x-tga;image/openraster;