diff --git a/debian/control b/debian/control
index e482526d..c78f12da 100644
--- a/debian/control
+++ b/debian/control
@@ -44,16 +44,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libgcr-base-3-1 (>= 3.10.1),
  libgcr-ui-3-1 (>= 3.10.1),
  libenchant1c2a (>= 1.6.0)
-Description: Email client
- Geary is an mail application for GNOME designed to let you manage
- your email quickly and effortlessly.
+Description: Email application
+ Geary is an email application built around conversations, for the
+ GNOME 3 desktop. It allows you to read, find and send email with a
+ straightforward, modern interface.
  .
- Its interface is based on conversations, so you can read an entire
- discussion without having to click from message to message.
+ Conversations allow you to read a complete discussion without having
+ to find and click from message to message.
  .
- Geary is still in development and has a limited but growing set of
- features. It works with Gmail, Yahoo! Mail, Outlook.com
- (experimental), and other popular IMAP servers.
+ Geary's features include:
+ - Quick email account setup
+ - Shows related messages together in conversations
+ - Fast, full text and keyword search
+ - Full-featured HTML and plain text message composer
+ - Desktop notification of new mail
+ - Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers
 
 Package: geary-dbg
 Architecture: any
@@ -62,13 +67,5 @@ Priority: extra
 Depends: geary (= ${binary:Version}), ${misc:Depends}
 Enhances: geary
 Description: Email client (debugging symbols)
- Geary is an mail application for GNOME designed to let you manage
- your email quickly and effortlessly.
- .
- Its interface is based on conversations, so you can read an entire
- discussion without having to click from message to message.
- .
- Geary is still in development and has a limited but growing set of
- features. It works with Gmail, Yahoo! Mail, Outlook.com
- (experimental), and other popular IMAP servers.
-
+ Geary is an mail application for GNOME. This package contains files
+ required for producing useful stack traces when debugging Geary.
diff --git a/desktop/geary.appdata.xml b/desktop/geary.appdata.xml
index b8076b70..d833eebf 100644
--- a/desktop/geary.appdata.xml
+++ b/desktop/geary.appdata.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Software Freedom Conservancy Inc. -->
+<!-- Copyright 2016 Michael Gratton <mike@vee.net> -->
 <component type="desktop">
   <id>geary.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1+</project_license>
   <name>Geary</name>
-  <summary>Lightweight mail client</summary>
+  <summary>Send and receive email</summary>
   <description>
     <p>
-      Geary is a mail application for GNOME designed to let you manage your email
-      quickly and effortlessly.
-      Its interface is based on conversations, so you can read an entire
-      discussion without having to click from message to message.
-      Geary is still in development and has a limited but growing set of features.
+      Geary is an email application built around conversations, for
+      the GNOME 3 desktop. It allows you to read, find and send email
+      with a straightforward, modern interface.
     </p>
     <p>
-      Geary is designed to integrate with the GNOME desktop and is completely free.
+      Conversations allow you to read a complete discussion without
+      having to find and click from message to message.
     </p>
+    <p>Geary's features include:</p>
     <ul>
-      <li>Lightweight mail client with full IMAP support</li>
-      <li>Mail grouped into conversations, not a tree of threads</li>
-      <li>As-you-type searching</li>
-      <li>Desktop notifications</li>
-      <li>Multiple account support</li>
-      <li>Inline HTML composer that saves drafts to the server</li>
-      <li>Works with Gmail, Yahoo! Mail, Outlook.com (experimental), and other popular IMAP servers</li>
+      <li>Quick email account setup</li>
+      <li>Shows related messages together in conversations</li>
+      <li>Fast, full text and keyword search</li>
+      <li>Full-featured HTML and plain text message composer</li>
+      <li>Desktop notification of new mail</li>
+      <li>Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers</li>
     </ul>
   </description>
   <url type="homepage">https://wiki.gnome.org/Apps/Geary</url>
+  <url type="faq">https://wiki.gnome.org/Apps/Geary/FAQ</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=geary</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <screenshots>
@@ -35,10 +36,15 @@
       <image>http://yorba.org/geary/geary.png</image>
     </screenshot>
   </screenshots>
-  <update_contact>geary@yorba.org</update_contact>
+  <translation type="gettext">geary</translation>
+  <update_contact>geary-list@gnome.org</update_contact>
   <project_group>GNOME</project_group>
   <kudos>
     <kudo>AppMenu</kudo>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>HighContrast</kudo>
     <kudo>ModernToolkit</kudo>
+    <kudo>Notifications</kudo>
+    <kudo>UserDocs</kudo>
   </kudos>
 </component>
diff --git a/desktop/geary.desktop.in b/desktop/geary.desktop.in
index 33bd1f87..e543f6e7 100644
--- a/desktop/geary.desktop.in
+++ b/desktop/geary.desktop.in
@@ -1,9 +1,11 @@
 [Desktop Entry]
 _Name=Geary
-_GenericName=Mail Client
-_X-GNOME-FullName=Geary Mail
+_GenericName=Email
+_X-GNOME-FullName=Geary Email
 _Comment=Send and receive email
-_Keywords=Email;E-mail;Mail;
+# Tranlators: These are desktop search terms. Do not translate
+# semicolons, end line with a semicolon.
+_Keywords=Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;
 Icon=geary
 TryExec=geary
 Exec=geary %U
@@ -17,4 +19,3 @@ Actions=Compose;
 [Desktop Action Compose]
 _Name=Compose Message
 Exec=geary mailto:
-
diff --git a/geary.doap b/geary.doap
index a5ec457f..5248153d 100644
--- a/geary.doap
+++ b/geary.doap
@@ -5,14 +5,18 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
 
-  <name xml:lang="en">geary</name>
-  <shortdesc xml:lang="en">Email client</shortdesc>
-  <description>Geary is an IMAP email client built for the GNOME desktop environment.  It
-    allows you to read and send email with a simple, modern interface.</description>
+  <name>Geary</name>
+  <short-name>geary</short-name>
+  <shortdesc xml:lang="en">Send and receive email</shortdesc>
+  <description xml:lang="en">Geary is an email application built
+around conversations, for the GNOME 3 desktop. It allows you to
+read, find and send email with a straightforward, modern
+interface.</description>
 
   <homepage rdf:resource="https://wiki.gnome.org/Apps/Geary" />
   <mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/geary-list" />
   <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=geary" />
+  <download-page rdf:resource="https://download.gnome.org/sources/geary/"/>
   <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
   <programming-language>Vala</programming-language>