diff --git a/.gitignore b/.gitignore
index 5a858c8a7..f441197ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ syntax: glob
 *~
 autom4te.cache
 data/defs.py
+data/org.gajim.Gajim.appdata.xml
 data/org.gajim.Gajim.desktop
 libtool
 po/.intltool-merge-cache
diff --git a/autogen.sh b/autogen.sh
index 7f7362b35..80ea3525a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@
   echo "[encoding: UTF-8]" > po/POTFILES.in \
   && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
-  && ls -1 data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
+  && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
   src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
   po/POTFILES.in \
   && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip  || exit 1
diff --git a/configure.ac b/configure.ac
index 2ba30d498..9b37af39f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_CONFIG_FILES([
 	data/moods/Makefile
 	data/activities/Makefile
 	icons/Makefile
+	data/org.gajim.Gajim.appdata.xml
 	data/org.gajim.Gajim.desktop.in
 	data/gajim-remote.desktop.in
 	data/defs.py
diff --git a/data/Makefile.am b/data/Makefile.am
index c2d6b1384..c3cbbd0d5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,11 @@
 SUBDIRS = gui emoticons pixmaps iconsets moods activities
 @INTLTOOL_DESKTOP_RULE@
 
+appstreamdir = $(datadir)/metainfo/
+appstream_in_files = org.gajim.Gajim.appdata.xml.in
+appstream_DATA = $(appstream_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
 desktopdir = $(datadir)/applications
 desktop_in_files = org.gajim.Gajim.desktop.in.in gajim-remote.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@@ -19,7 +24,8 @@ other_DATA = other/servers.xml other/dh4096.pem
 man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
 
 
-EXTRA_DIST = $(desktop_in_files) \
+EXTRA_DIST = $(appstream_in_files) \
+			 $(desktop_in_files) \
 			 $(sounds_DATA) \
 			 $(other_DATA) \
 			 $(man_MANS) \
@@ -29,6 +35,8 @@ EXTRA_DIST = $(desktop_in_files) \
 DISTCLEANFILES = $(desktop_DATA) \
 				 $(installdefs_DATA)
 
-CLEANFILES = org.gajim.Gajim.desktop gajim-remote.desktop
+CLEANFILES = $(appstream_DATA) \
+			 org.gajim.Gajim.desktop \
+			 gajim-remote.desktop
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/org.gajim.Gajim.appdata.xml.in b/data/org.gajim.Gajim.appdata.xml.in
new file mode 100644
index 000000000..e02216241
--- /dev/null
+++ b/data/org.gajim.Gajim.appdata.xml.in
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.gajim.Gajim.desktop</id>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>GPL-3.0</project_license>
+  <name>Gajim</name>
+  <summary>A GTK+ Jabber client</summary>
+
+  <description>
+    <p>Gajim is a chat client to be used with Jabber.org, Google Talk, Hangouts,
+    Live Journal Talk, Nimbuzz, Ovi, Talkonaut, and thousands of other services
+    run by companies and ISPs, and volunteers around the world.
+    </p>
+    <p>If you have a few accounts on different servers, if you want to be in
+    contact with your friends and family all the time, then Gajim is for you.
+    </p>
+    <p>Features:</p>
+    <ul>
+     <li>Tabbed chat window and single window modes</li>
+     <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation, minimize group chat to roster</li>
+     <li>Emoticons, avatars, PEP (user activity, mood and tune)</li>
+     <li>Audio / video conferences</li>
+     <li>File transfer, room bookmarks</li>
+     <li>Metacontacts support</li>
+     <li>Trayicon, speller, extended chat history functionalities</li>
+     <li>TLS, GPG and End-To-End encryption support (with SSL legacy support)</li>
+     <li>Transport registration support</li>
+     <li>Service discovery including nodes, user search</li>
+     <li>Wikipedia, dictionary and search engine lookup</li>
+     <li>Multiple accounts support</li>
+     <li>XML console</li>
+     <li>Link local (bonjour / zeroconf), BOSH</li>
+     <li>Other features via plugins </li>
+    </ul>
+  </description>
+
+  <categories>
+​    <category>GNOME</category>
+​    <category>GTK</category>
+​    <category>InstantMessaging</category>
+​    <category>Network</category>
+​  </categories>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://gajim.org/imgs/gajim_roster.png</image>
+      <caption>Roster, list of contacts</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gajim.org/imgs/gajim_tabbed_chat.png</image>
+      <caption>Tabbed chat window</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gajim.org/imgs/groupchat_window.png</image>
+      <caption>Group chat support</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gajim.org/imgs/history_window.png</image>
+      <caption>Chat history</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gajim.org/imgs/gajim_jingle.png</image>
+      <caption>Jingle video conference</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gajim.org/imgs/gajim_plugins.png</image>
+      <caption>Plugin manager</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>Gajim Team</developer_name>
+  <update_contact>gajim-devel_AT_gajim.org</update_contact>
+
+  <url type="homepage">https://gajim.org/</url>
+  <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url>
+  <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url>
+  <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/home</url>
+  <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url>
+</component>