diff --git a/calibre-ebook-edit.appdata.xml b/calibre-ebook-edit.appdata.xml
new file mode 100644
index 0000000..3a2de57
--- /dev/null
+++ b/calibre-ebook-edit.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<application>
+  <id type="desktop">calibre-ebook-edit.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      Calibre ebook editor can be used to edit e-books in mobi
+      and e-pub formats.
+    </p>
+  </description>
+  <screenshots>
+    <!--
+        <screenshot type="default" width="800" height="600">http://www.hughsie.com/en_US/main.png</screenshot>
+        <screenshot width="800" height="600">http://www.hughsie.com/en_US/preferences.png</screenshot>
+    -->
+  </screenshots>
+  <url type="homepage">http://calibre-ebook.com/</url>
+  <updatecontact>zbyszek@in.waw.pl</updatecontact>
+</application>
diff --git a/calibre-ebook-viewer.appdata.xml b/calibre-ebook-viewer.appdata.xml
new file mode 100644
index 0000000..8581499
--- /dev/null
+++ b/calibre-ebook-viewer.appdata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<application>
+  <id type="desktop">calibre-ebook-viewer.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      Calibre ebook viewer can be used to read e-books in many
+      formats, including e-pub, MOBI, PDF, HTML, djvu, plain text,
+      and popular office formats.
+    </p>
+
+    <p>
+      This is the viewer launched by calibre.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" width="1024" height="576">http://in.waw.pl/~zbyszek/calibre/calibre-viewer-epub.png</screenshot>
+    <screenshot width="1200" height="675">http://in.waw.pl/~zbyszek/calibre/calibre-viewer-math.png</screenshot>
+  </screenshots>
+  <url type="homepage">http://calibre-ebook.com/</url>
+  <updatecontact>zbyszek@in.waw.pl</updatecontact>
+</application>
diff --git a/calibre-gui.appdata.xml b/calibre-gui.appdata.xml
new file mode 100644
index 0000000..4491736
--- /dev/null
+++ b/calibre-gui.appdata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<application>
+  <id type="desktop">calibre-gui.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      Calibre is used to manage a collections of e-books in many popular
+      formats. Books may be viewed, or converted between e-pub, MOBI,
+      and similar formats. Searching by author, title, other metadata,
+      and user defined characteristics is possible.
+    </p>
+
+    <p>
+      This is one of the most versatile and feature-full e-book viewers.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" width="1200" height="675">http://in.waw.pl/~zbyszek/calibre/calibre-main-window.png</screenshot>
+    <screenshot width="1024" height="576">http://in.waw.pl/~zbyszek/calibre/calibre-book-search.png</screenshot>
+    <screenshot width="1024" height="580">http://in.waw.pl/~zbyszek/calibre/calibre-rlfviewer.png</screenshot>
+    <screenshot width="1024" height="576">http://in.waw.pl/~zbyszek/calibre/calibre-viewer-epub.png</screenshot>
+  </screenshots>
+  <url type="homepage">http://calibre-ebook.com/</url>
+  <updatecontact>zbyszek@in.waw.pl</updatecontact>
+</application>
diff --git a/calibre-lrfviewer.appdata.xml b/calibre-lrfviewer.appdata.xml
new file mode 100644
index 0000000..4459543
--- /dev/null
+++ b/calibre-lrfviewer.appdata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<application>
+  <id type="desktop">calibre-lrfviewer.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      Calibre LRF viewer can be used to read e-books in SONY
+      e-book format (LRF).
+    </p>
+
+    <p>
+      This viewer is launched by calibre for LRF e-books.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" width="1024" height="580">http://in.waw.pl/~zbyszek/calibre/calibre-rlfviewer.png</screenshot>
+  </screenshots>
+  <url type="homepage">http://calibre-ebook.com/</url>
+  <updatecontact>zbyszek@in.waw.pl</updatecontact>
+</application>
diff --git a/calibre.spec b/calibre.spec
index d03d851..7a392b0 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -6,8 +6,8 @@
 
 Name:           calibre
 Version:        1.20.0
-Release:        1%{?dist}
-Summary:        E-book converter and library management
+Release:        2%{?dist}
+Summary:        E-book converter and library manager
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://calibre-ebook.com/
@@ -22,6 +22,10 @@ URL:            http://calibre-ebook.com/
 Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
+Source3:        calibre-gui.appdata.xml
+Source4:        calibre-ebook-viewer.appdata.xml
+Source5:        calibre-lrfviewer.appdata.xml
+Source6:        calibre-ebook-edit.appdata.xml
 Patch1:         %{name}-no-update.patch
 Patch2:         calibre-0.9.38-pillow.patch
 
@@ -131,6 +135,9 @@ mkdir -p %{buildroot}%{_datadir}/mime/packages
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/desktop-directories
 
+# create directory for gnome software data
+mkdir -p %{buildroot}%{_datadir}/appdata
+
 # create directory for calibre environment module
 # the install script assumes it's there.
 mkdir -p %{buildroot}%{python_sitelib}
@@ -234,6 +241,8 @@ rm -f %{buildroot}%{_bindir}/%{name}-uninstall
 
 cp -p %{SOURCE2} %{buildroot}%{_bindir}/calibre-mount-helper
 
+cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{_datadir}/appdata/
+
 # fix the location of bash completion file
 find %{buildroot}%{_datadir}/bash-completion/
 mv %{buildroot}%{_datadir}/bash-completion/%{name} %{buildroot}%{_datadir}/bash-completion/completions/
@@ -292,8 +301,12 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
 %{python_sitelib}/init_calibre.py*
 %{_datadir}/bash-completion/completions/%{name}
 %{_datadir}/zsh/site-functions/_%{name}
+%{_datadir}/appdata/calibre*.appdata.xml
 
 %changelog
+* Fri Jan 24 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> 1.20.0-2
+- Add appdata
+
 * Sat Jan 18 2014 Kevin Fenzi <kevin@scrye.com> 1.20.0-1
 - Update to 1.20.0