diff --git a/Makefile.am b/Makefile.am
index 089b942f..c31ac6f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ DISTCLEANFILES =                \
   intltool-update               \
   po/.intltool-merge-cache
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-appstream-util
+
 # Remove doc directory on uninstall
 uninstall-local:
 	-rm -r $(gnome_calendardocdir)
diff --git a/configure.ac b/configure.ac
index 99a5f4f7..32595d27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,12 +97,15 @@ PKG_CHECK_MODULES(CALENDAR,
                   libedataserver-1.2 >= $EDATASERVER_REQUIRED
                   libical >= $LIBICAL_REQUIRED)
 
+APPSTREAM_XML
+
 AC_CONFIG_FILES([
       Makefile
       src/Makefile
       data/Makefile
       data/org.gnome.Calendar.desktop.in
       data/icons/Makefile
+      data/appdata/Makefile
       po/Makefile.in
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 50135ed1..0b506b31 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = icons
+SUBDIRS = icons appdata
 
 desktopdir = $(datadir)/applications
 desktop_in_files = org.gnome.Calendar.desktop.in
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
new file mode 100644
index 00000000..559e5f74
--- /dev/null
+++ b/data/appdata/Makefile.am
@@ -0,0 +1,8 @@
+@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
new file mode 100644
index 00000000..5a3f0afc
--- /dev/null
+++ b/data/appdata/org.gnome.Calendar.appdata.xml.in
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Igor Gnatenko <ignatenko@src.gnome.org> -->
+<component type="desktop">
+  <id>org.gnome.Calendar.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <_name>Calendar</_name>
+  <_summary>Calendar for GNOME</_summary>
+
+  <description>
+    <_p>
+      Calendar is a simple and beautiful calendar application designed to fit
+      GNOME 3.
+    </_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>
+    <screenshot type="default">
+      <image width="1366" height="768">https://feaneron.files.wordpress.com/2014/12/captura-de-tela-de-2014-12-23-191620.png</image>
+    </screenshot>
+    <screenshot>
+      <_caption>Search for events</_caption>
+      <image width="1366" height="768">https://feaneron.files.wordpress.com/2014/12/captura-de-tela-de-2014-12-23-184243.png</image>
+    </screenshot>
+    <screenshot>
+      <_caption>Calendar management</_caption>
+      <image width="1377" height="798">https://feaneron.files.wordpress.com/2014/12/calendar-selector.jpg</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://wiki.gnome.org/Apps/Calendar</url>
+  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-calendar</url>
+  <project_group>GNOME</project_group>
+
+  <update_contact>ignatenko@src.gnome.org</update_contact>
+
+</component>