diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30721a43c..685b418bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,9 +224,9 @@ endif()
 if(NOT DEFINED APPDATADIR)
     if(UNIX)
         if(BUILD_BUNDLE)
-            set(APPDATADIR "${DATADIR}/share/appdata")
+            set(APPDATADIR "${DATADIR}/share/metainfo")
         else()
-            set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
+            set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/metainfo")
         endif()
     endif()
 endif()
diff --git a/rawtherapee.appdata.xml b/rawtherapee.appdata.xml
index 3bcab8918..c1a1bf6a7 100644
--- a/rawtherapee.appdata.xml
+++ b/rawtherapee.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 Maciej Dworak www.rawtherapee.com -->
-<application>
+<component>
     <id type="desktop">rawtherapee.desktop</id>
     <metadata_license>CC-BY-SA-4.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
@@ -15,13 +15,27 @@
         </p>
     </description>
     <screenshots>
-        <screenshot type="default">http://rawpedia.rawtherapee.com/images/9/99/Rt-5-misty1.jpg</screenshot>
-        <screenshot>http://rawpedia.rawtherapee.com/images/2/2f/Rt-5-cc24-lcp.jpg</screenshot>
-        <screenshot>http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg</screenshot>
-        <screenshot>http://rawtherapee.com/images/screenshots/rt-42_03-macro-detail-toning.jpg</screenshot>
-        <screenshot>http://rawtherapee.com/images/screenshots/rt-42_05-cow-bw-toning.jpg</screenshot>
-        <screenshot>http://rawtherapee.com/images/screenshots/rt-42_08-fb-metadata.jpg</screenshot>
-        <screenshot>http://rawtherapee.com/images/screenshots/rt-42_09-queue.jpg</screenshot>
+        <screenshot type="default">
+            <image>http://rawpedia.rawtherapee.com/images/9/99/Rt-5-misty1.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawpedia.rawtherapee.com/images/2/2f/Rt-5-cc24-lcp.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawtherapee.com/images/screenshots/rt-42_03-macro-detail-toning.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawtherapee.com/images/screenshots/rt-42_05-cow-bw-toning.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawtherapee.com/images/screenshots/rt-42_08-fb-metadata.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>http://rawtherapee.com/images/screenshots/rt-42_09-queue.jpg</image>
+        </screenshot>
     </screenshots>
     <keywords>
         <keyword>raw</keyword>
@@ -31,5 +45,5 @@
         <keyword>graphics</keyword>
     </keywords>
     <url type="homepage">http://rawtherapee.com/</url>
-    <updatecontact>contactus_at_rawtherapee.com</updatecontact>
-</application>
+    <update_contact>contactus@rawtherapee.com</update_contact>
+</component>