diff --git a/data/Makefile.am b/data/Makefile.am
index 53f473d1..da3117e5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = icons appdata
+SUBDIRS = icons
 
 desktopdir = $(datadir)/applications
 desktop_in_files = org.gnome.Calendar.desktop.in
@@ -30,6 +30,11 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = appdata/org.gnome.Calendar.appdata.xml.in
+
 EXTRA_DIST=                     \
   org.gnome.Calendar.desktop    \
   calendar.gresource.xml        \
@@ -41,10 +46,12 @@ EXTRA_DIST=                     \
   ui/window.ui                  \
   ui/year-view.ui               \
   theme/gtk-styles.css          \
+  $(appdata_in_files)           \
   $(desktop_in_files)           \
   $(gsettingsschema_in_files)
 
 CLEANFILES =                    \
   $(service_DATA)               \
   $(desktop_DATA)               \
-  $(gsettings_SCHEMAS)
+  $(gsettings_SCHEMAS)          \
+  $(appdata_DATA)
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
deleted file mode 100644
index 559e5f74..00000000
--- a/data/appdata/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-@APPSTREAM_XML_RULES@
-appstream_in_files = org.gnome.Calendar.appdata.xml.in
-appstream_XML = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
-EXTRA_DIST = $(appdata_in_files)
-CLEANFILES = $(appstream_XML)
-
--include $(top_srcdir)/git.mk
diff --git a/data/appdata/org.gnome.Calendar.appdata.xml.in b/data/appdata/org.gnome.Calendar.appdata.xml.in
index abf12aa6..7713b4ac 100644
--- a/data/appdata/org.gnome.Calendar.appdata.xml.in
+++ b/data/appdata/org.gnome.Calendar.appdata.xml.in
@@ -9,16 +9,11 @@
 
   <description>
     <_p>
-      Calendar is a simple and beautiful calendar application designed to fit
-      GNOME 3.
+      GNOME Calendar is a simple and beautiful calendar application designed to perfectly fit the GNOME desktop. By reusing the components which the GNOME desktop is build on, Calendar nicely integrates with the GNOME ecosystem.
+    </_p>
+    <_p>
+      We aim to find the perfect balance between nicely crafted features and user-centred usability. No excess, no lacks. You'll feel comfortable using Calendar, like you've been using it for ages!
     </_p>
-    <_p>Features:</_p>
-    <ul>
-      <_li>Week, month and year views</_li>
-      <_li>Basic editing of events</_li>
-      <_li>Evolution Data Server integration</_li>
-      <_li>Search support</_li>
-    </ul>
   </description>
 
   <screenshots>