diff --git a/slic3r.appdata.xml b/slic3r.appdata.xml
new file mode 100644
index 0000000..a64b8a4
--- /dev/null
+++ b/slic3r.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2013 Alessandro Ranellucci <alessandro@unterwelt.it> -->
+<application>
+ <id type="desktop">slic3r.desktop</id>
+ <licence>CC-BY</licence>
+ <summary>G-code generator for 3D printers</summary>
+ <description>
+  <p>Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for 3D printers. It's compatible with any modern printer based on the RepRap toolchain, including all those based on the Marlin, Sprinter and Repetier firmware. It also works with Mach3 and LinuxCNC controllers.</p>
+  <p>Key features are:</p>
+  <ul>
+    <li>additional complete command-line interface to use it with no GUI</li>
+    <li>multi-material (multiple extruders) object printing</li>
+    <li>multiple G-code flavors supported (RepRap, Makerbot, Mach3 etc.)</li>
+    <li>ability to plate multiple objects having distinct print settings</li>
+    <li>multithread processing</li>
+    <li>STL auto-repair (tolerance for broken models)</li>
+  </ul>
+ </description>
+ <screenshots>
+  <screenshot type="default" width="1061" height="595">https://f.cloud.github.com/assets/2401856/1817033/e66d31a0-6f67-11e3-89d5-05c54cc6c8ab.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://slic3r.org/</url>
+ <updatecontact>alessandro@unterwelt.it</updatecontact>
+</application>
diff --git a/slic3r.desktop b/slic3r.desktop
index ab74c86..5bafc06 100644
--- a/slic3r.desktop
+++ b/slic3r.desktop
@@ -1,8 +1,7 @@
-
 [Desktop Entry]
 Name=Slic3r
 Exec=slic3r
 Icon=/usr/share/pixmaps/slic3r.ico
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;3DGraphics;
diff --git a/slic3r.spec b/slic3r.spec
index 24c9f46..f6c4c7b 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -27,6 +27,8 @@ Patch2:         %{name}-clipper.patch
 %endif
 
 Source1:        %{name}.desktop
+Source2:        %{name}.appdata.xml
+
 BuildRequires:  perl(Boost::Geometry::Utils) >= 0.15
 BuildRequires:  perl(Class::XSAccessor)
 BuildRequires:  perl(Encode::Locale)
@@ -118,6 +120,7 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{perl_vendorlib}
 mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/appdata
 
 cp -a %{name}.pl %{buildroot}%{_bindir}/%{name}
 cp -ar lib/* %{buildroot}%{perl_vendorlib}
@@ -126,6 +129,8 @@ cp -a var/* %{buildroot}%{_datadir}/%{name}
 ln -s ../%{name}/Slic3r.ico %{buildroot}%{_datadir}/pixmaps/%{name}.ico
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
+cp %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
 %{_fixperms} %{buildroot}*
 
 %check
@@ -143,11 +148,16 @@ SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor
 %{perl_vendorarch}/auto/Slic3r*
 %{_datadir}/pixmaps/%{name}.ico
 %{_datadir}/applications/%{name}.desktop
+%if 0%{?fedora} < 21
+%dir %{_datadir}/appdata
+%endif
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/%{name}
 
 %changelog
 * Wed Mar 05 2014 Miro Hrončok <mhroncok@redhat.com> - 1.0.0-0.4.RC3
 - New RC version
+- Include appdata file
 
 * Thu Jan 02 2014 Miro Hrončok <mhroncok@redhat.com> - 1.0.0-0.3.RC2
 - New RC version