diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2073d8e6e..9652e1a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,4 +52,4 @@ add_subdirectory(fileitemactionplugin)
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
-install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index b596e7695..20c3510ab 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -25,5 +25,5 @@ target_link_libraries(kcm_kdeconnect
 
 install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
 
+install(FILES org.kde.kdeconnect.kcm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES kdeconnect.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/kcm/kdeconnect.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
similarity index 100%
rename from kcm/kdeconnect.desktop
rename to kcm/org.kde.kdeconnect.kcm.desktop
diff --git a/kdeconnect.appdata.xml b/kdeconnect.appdata.xml
new file mode 100644
index 000000000..8501402d0
--- /dev/null
+++ b/kdeconnect.appdata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>org.kde.kdeconnect.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>KDE Connect</name>
+  <summary>Seamless connection of your devices</summary>
+  <description>
+    <p>KDE Connect provides integration between your Android phone and your desktop.</p>
+  </description>
+  <url type="homepage">https://community.kde.org/KDEConnect/</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kdeconnect</url>
+<!--   <url type="help">http://docs.kde.org/stable/en/kdeedu/kalgebra/index.html</url> -->
+  <screenshots>
+    <screenshot type="default">
+<!--       <image>http://kde.org/images/screenshots/kalgebra.png</image> -->
+    </screenshot>
+  </screenshots>
+  <project_group>KDE Connect</project_group>
+  <provides>
+    <binary>kdeconnectd</binary>
+  </provides>
+</component>
diff --git a/kdeconnect-non-plasma.desktop b/org.kde.kdeconnect.nonplasma.desktop
similarity index 100%
rename from kdeconnect-non-plasma.desktop
rename to org.kde.kdeconnect.nonplasma.desktop