diff --git a/emacs.appdata.xml b/emacs.appdata.xml
new file mode 100644
index 0000000..6f98c3b
--- /dev/null
+++ b/emacs.appdata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<application>
+<id type="desktop">emacs.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
+<project_license>GPL-3.0+</project_license>
+<name>Powerful editor</name>
+<summary>Edit text files, view pictures and binary files</summary>
+<description>
+<p>
+Emacs is a powerful, customizable, self-documenting, modeless
+editor. It is used primarely to edit text, including text
+documents, source code of programs, web pages and XML documents,
+but can also be used to display and edit binary files.
+</p>
+
+<p>
+Emacs allows efficient editing of text with shortcuts which
+allow operating on letters, words, sentences, and paragraphs as
+single units. This includes both moving around and operations
+like copying, deleting, transposing, and pasting. Macros can be
+conveniently defined to repeat sequences of commands. In
+addition, Emacs is (partially) built in a scripting language
+(elisp) which can also be used to define further functions
+extending existing capabilities.
+</p>
+
+<p>
+Emacs has extensive support for editing source code, including
+programmable syntax highlighting, automatic indentation, source
+code indexing, overview modes, and navigation based on language
+specific units like functions and blocks. It is also possible to
+invoke the compiler from within Emacs and easily move between
+compiler output and corresponding positions in the source.
+</p>
+
+<p>
+Emacs has multiple modules which provide further functionality.
+This provides the capability to read mail, news, browse
+pictures, read man and info pages, browse the web, execute
+arbitrary programs, and more, without leaving the editor.
+</p>
+</description>
+<screenshots>
+<screenshot type="default" width="1595" height="888">http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png</screenshot>
+<screenshot width="1199" height="667">http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png</screenshot>
+<screenshot width="1019" height="572">http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png</screenshot>
+<screenshot width="1199" height="667">http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png</screenshot>
+<screenshot width="794" height="439">http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png</screenshot>
+</screenshots>
+<url type="homepage">http://www.gnu.org/software/emacs/</url>
+<updatecontact>zbyszek@in.waw.pl</updatecontact>
+</application>
diff --git a/emacs.spec b/emacs.spec
index 2cb7562..59f46ef 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,8 +3,8 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.4
-Release: 2%{?dist}
-License: GPLv3+
+Release: 3%{?dist}
+License: GPLv3+ and CC0-1.0
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
 Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
@@ -17,6 +17,7 @@ Source5: default.el
 Source6: emacs-terminal.desktop
 Source7: emacs-terminal.sh
 Source8: emacs.service
+Source9: %{name}.appdata.xml
 # rhbz#713600
 Patch1: emacs-spellchecker.patch
 
@@ -279,6 +280,8 @@ install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # Install emacsclient desktop file
 install -p -m 0644 %SOURCE2 %{buildroot}/%{_datadir}/applications/emacsclient.desktop
+mkdir -p %{buildroot}/%{_datadir}/appdata
+cp -a %SOURCE9 %{buildroot}/%{_datadir}/appdata
 
 # Install rpm macro definition file
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
@@ -386,6 +389,7 @@ update-desktop-database &> /dev/null || :
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/applications/emacsclient.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/emacs.png
 #%{_datadir}/icons/hicolor/*/apps/emacs22.png
 %{_datadir}/icons/hicolor/scalable/apps/emacs.svg
@@ -427,6 +431,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Tue Nov 18 2014 Petr Hracek <phracek@redhat.com> - 1:24.4-3
+- Resolves #1124892 Add appdata file
+
 * Wed Oct 29 2014 Petr Hracek <phracek@redhat.com> - 1:24.4-2
 - Bump version. Correct obsolete version