diff --git a/debian/yubioath-desktop.install b/debian/yubioath-desktop.install
index f264e73f8..292d235fb 100644
--- a/debian/yubioath-desktop.install
+++ b/debian/yubioath-desktop.install
@@ -1,2 +1,2 @@
-resources/yubioath-desktop.desktop usr/share/applications
+resources/com.yubico.yubioath.desktop usr/share/applications
 resources/icons/com.yubico.yubioath.svg usr/share/pixmaps
diff --git a/docker/xenial-appimage/Dockerfile b/docker/xenial-appimage/Dockerfile
index a8277ad3b..a446e39a4 100644
--- a/docker/xenial-appimage/Dockerfile
+++ b/docker/xenial-appimage/Dockerfile
@@ -45,7 +45,7 @@ RUN mkdir -p yubioath-desktop/appDir/usr \
     && dpkg -x libykpers*.deb appDir/ \
     && qmake \
     && make \
-    && cp resources/yubioath-desktop.desktop appDir/ \
+    && cp resources/com.yubico.yubioath.desktop appDir/ \
     && cp resources/icons/com.yubico.yubioath.svg appDir/ \
     && cp ./yubioath-desktop appDir/usr/bin/ \
     && wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" \
diff --git a/resources/com.yubico.yubioath.appdata.xml b/resources/com.yubico.yubioath.appdata.xml
new file mode 100644
index 000000000..02b15d401
--- /dev/null
+++ b/resources/com.yubico.yubioath.appdata.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.yubico.yubioath</id>
+  <launchable type="desktop-id">com.yubico.yubioath.desktop</launchable>
+
+  <metadata_license>MIT</metadata_license>
+  <project_license>BSD-2-Clause</project_license>
+
+  <name>Yubico Authenticator</name>
+  <summary>Graphical interface for displaying OATH codes with a YubiKey</summary>
+  <url type="homepage">https://support.yubico.com/support/tickets/new</url>
+  <content_rating type="oars-1.1"/>
+
+  <developer_name>Yubico</developer_name>
+
+  <description>
+    <p>Generating Open Authentication (OATH) time-based TOTP and event-based HOTP one-time password codes, with the help of a YubiKey that protects the shared secrets.</p>
+    <p>Features:</p>
+    <ul>
+      <li>Add a credential by scanning a QR code on the screen</li>
+      <li>Favorite your most used credentials for easy access</li>
+      <li>Keep your secret seeds safe by storing them on a YubiKey</li>
+      <li>Require a touch on YubiKey to generate the code</li>
+      <li>Protect your credentials with a device password</li>
+      <li>Connect an external smart card reader and use the YubiKey over NFC</li>
+    </ul>
+  </description>
+
+  <screenshots>
+    ​<screenshot type="default">
+      <image type="source" width="850" height="393">https://raw.githubusercontent.com/Yubico/yubioath-desktop/master/screenshot.png</image>
+      <caption>Different modes and themes</caption>
+    </screenshot>
+  </screenshots>
+
+  <releases>
+    <release version="5.0.2" date="2020-01-29">
+      <description>
+        <ul>
+          <li>Allow spaces in secret key when adding accounts</li>
+          <li>UI: Move favorite button to the credential card</li>
+          <li>UI: Improved scrolling behaviour</li>
+          <li>Windows: Improve how .dll files are loaded, thanks to Marius Gabriel Mihai for reporting this!</li>
+          <li>Windows: Initial support for .msi installers. If upgrading from the .exe installer, make sure to uninstall the older version before using the .msi</li>
+        </ul>
+      </description>
+    </release>
+    <release version="5.0.1" date="2019-05-29">
+      <description>
+        <ul>
+          <li>New colors for the account icons.</li>
+          <li>Use Roboto font on all platforms.</li>
+          <li>Increase some text sizes for better readability.</li>
+          <li>Change icon for the Settings button and move it to the left.</li>
+          <li>SysTray: Open application on double-click.</li>
+          <li>Terminology: Use "Accounts" instead of "Credentials".</li>
+          <li>Bugfix: Clear old accounts correctly when switching between devices.</li>
+          <li>Add keyboard shortcut (Ctrl/Cmd + i) for info popup.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="5.0.0" date="2019-09-23">
+      <description>
+        <ul>
+          <li>New UI based on Material Design and Qt Quick Controls 2</li>
+          <li>Add Dark Mode and Light Mode</li>
+          <li>Feature: Allow switching between connected YubiKeys</li>
+          <li>Feature: Select favorite credentials, available from the System Tray/Menu Bar</li>
+          <li>Show some information about the connected YubiKey, such as firmware version and serial number</li>
+          <li>Add experimental support for external smart card readers, enabling the use of a YubiKey over NFC</li>
+          <li>Add initial accessability support</li>
+        </ul>
+      </description>
+    </release>
+  </releases>
+</component>
\ No newline at end of file
diff --git a/resources/yubioath-desktop.desktop b/resources/com.yubico.yubioath.desktop
similarity index 100%
rename from resources/yubioath-desktop.desktop
rename to resources/com.yubico.yubioath.desktop