diff --git a/data/meson.build b/data/meson.build
index 178fc2f..d497a30 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,28 @@
 datadir = get_option('datadir')
 
+# Desktop file
 install_data('sm.puri.Calls.desktop',
              install_dir : join_paths(datadir, 'applications'))
 
+desktop_utils = find_program('desktop-file-validate', required: false)
+if desktop_utils.found()
+    test('Validate desktop file', desktop_utils,
+        args: ['sm.puri.Calls.desktop']
+    )
+endif
+
+# Appdata file
+install_data('sm.puri.Calls.appdata.xml',
+    install_dir: join_paths(datadir, 'metainfo'),
+)
+
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+    test('Validate appstream file', appstream_util,
+        args: ['validate-relax', 'sm.puri.Calls.appdata.xml']
+    )
+endif
+
+# Icons
 install_data('sm.puri.Calls.png',
              install_dir : join_paths(datadir, 'icons', 'hicolor', '256x256', 'apps'))
diff --git a/data/sm.puri.Calls.appdata.xml b/data/sm.puri.Calls.appdata.xml
new file mode 100644
index 0000000..66e1fd6
--- /dev/null
+++ b/data/sm.puri.Calls.appdata.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>sm.puri.Calls.desktop</id>
+    <metadata_license>CC0</metadata_license>
+    <project_license>GPL-3.0+</project_license>
+    <name>Calls</name>
+    <summary>A phone dialer and call handler</summary>
+    
+    <description>Calls is a simple, elegant phone dialer and call handler built using GTK+ 3.</description>
+
+    <url type="homepage">https://gitlab.gnome.org/Community/Purism/calls</url>
+    <url type="bugtracker">https://gitlab.gnome.org/Community/Purism/calls/issues</url>
+    
+    <project_group>GNOME</project_group>
+    <developer_name>Purism Developers</developer_name>
+
+    <kudos>
+        <kudo>ModernToolkit</kudo>
+    </kudos>
+
+    <categories>
+        <category>Audio</category>
+    </categories>
+
+    <content_rating type="oars-1.1">
+        <content_attribute id="violence-cartoon">none</content_attribute>
+        <content_attribute id="violence-fantasy">none</content_attribute>
+        <content_attribute id="violence-realistic">none</content_attribute>
+        <content_attribute id="violence-bloodshed">none</content_attribute>
+        <content_attribute id="violence-sexual">none</content_attribute>
+        <content_attribute id="violence-desecration">none</content_attribute>
+        <content_attribute id="violence-slavery">none</content_attribute>
+        <content_attribute id="violence-worship">none</content_attribute>
+        <content_attribute id="drugs-alcohol">none</content_attribute>
+        <content_attribute id="drugs-narcotics">none</content_attribute>
+        <content_attribute id="drugs-tobacco">none</content_attribute>
+        <content_attribute id="sex-nudity">none</content_attribute>
+        <content_attribute id="sex-themes">none</content_attribute>
+        <content_attribute id="sex-homosexuality">none</content_attribute>
+        <content_attribute id="sex-prostitution">none</content_attribute>
+        <content_attribute id="sex-adultery">none</content_attribute>
+        <content_attribute id="sex-appearance">none</content_attribute>
+        <content_attribute id="language-profanity">none</content_attribute>
+        <content_attribute id="language-humor">none</content_attribute>
+        <content_attribute id="language-discrimination">none</content_attribute>
+        <content_attribute id="social-chat">none</content_attribute>
+        <content_attribute id="social-info">none</content_attribute>
+        <content_attribute id="social-audio">intense</content_attribute>
+        <content_attribute id="social-location">none</content_attribute>
+        <content_attribute id="social-contacts">none</content_attribute>
+        <content_attribute id="money-purchasing">none</content_attribute>
+        <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+
+    <releases>
+        <release version="0.0.0" date="2018-05-04">
+            <description>Pre-release development</description>
+        </release>
+    </releases>
+</component>
diff --git a/data/sm.puri.Calls.desktop b/data/sm.puri.Calls.desktop
index dff43d7..2b16058 100644
--- a/data/sm.puri.Calls.desktop
+++ b/data/sm.puri.Calls.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
 Name=Calls
 GenericName=Phone
-Comment=Make telephone calls
+Comment=A phone dialer and call handler
 # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
 Keywords=Telephone;Call;Phone;Dial;Dialer;PTSN;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=sm.puri.Calls
 TryExec=calls
-Exec=calls
+Exec=calls %U
 Type=Application
+StartupNotify=true
 Terminal=false
 Categories=GNOME;GTK;Telephony;