diff --git a/org.sigrok.Pulseview.appdata.xml b/org.sigrok.Pulseview.appdata.xml
new file mode 100644
index 0000000..9b012f9
--- /dev/null
+++ b/org.sigrok.Pulseview.appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<component type="desktop">
+  <id>org.sigrok.Pulseview.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Pulseview</name>
+  <summary>Logic analyzer, oscilloscope and MSO GUI</summary>
+  <description>
+    <p>PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok.</p>
+    <p>Features:</p>
+    <ul>
+      <li>Fast O(log N) signal rendering at all zoom levels</li>
+      <li>Protocol decoder support</li>
+      <li>Trace groups support</li>
+    </ul>
+  </description>
+  <url type="homepage">http://www.sigrok.org/wiki/Pulseview</url>
+  <url type="bugtracker">http://sigrok.org/bugzilla/enter_bug.cgi?format=guided&amp;product=Pulseview</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://sigrok.org/wimg/e/ee/PulseView_I2C_DS1307_Decode.png</image>
+    </screenshot>
+  </screenshots>
+  <project_group>Sigrok</project_group>
+  <provides>
+    <binary>pulseview</binary>
+  </provides>
+</component>
diff --git a/pulseview.changes b/pulseview.changes
index 1c10f18..b95fa8b 100644
--- a/pulseview.changes
+++ b/pulseview.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Oct 22 21:26:57 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Add org.sigrok.Pulseview.appdata.xml
+- Install desktop file and icons for pulseview, register pulseview
+  as handler for application/x-sigrok-dump mimetype
+
 -------------------------------------------------------------------
 Tue Oct 11 23:29:37 UTC 2016 - stefan.bruens@rwth-aachen.de
 
diff --git a/pulseview.spec b/pulseview.spec
index 336f679..a9daf39 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -24,6 +24,7 @@ License:        GPL-3.0+
 Group:          Productivity/Scientific/Electronics
 Url:            http://sigrok.org
 Source0:        http://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
+Source1:        org.sigrok.Pulseview.appdata.xml
 BuildRequires:  boost-devel >= 1.53.0
 BuildRequires:  cmake
 BuildRequires:  glib2-devel
@@ -36,6 +37,7 @@ BuildRequires:  libqt4-devel
 %endif
 BuildRequires:  libsigrok-devel >= 0.4.0
 BuildRequires:  libsigrokdecode-devel >= 0.4.0
+BuildRequires:  update-desktop-files
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -58,10 +60,26 @@ make %{?_smp_mflags}
 %cmake_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
+install -m 644 -D icons/sigrok-logo-notext.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/pulseview.png
+install -m 644 -D icons/sigrok-logo-notext.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/pulseview.svg
+
+install -m 755 -d %{buildroot}%{_datadir}/applications/
+install -m 644 contrib/pulseview.desktop %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
+sed -i -e 's/Icon=.*/Icon=pulseview/' %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
+sed -i -e 's/\(Icon.*\)/\1\nMimeType=application\/x-sigrok-dump;/' %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
+%suse_update_desktop_file -r org.sigrok.Pulseview Education Engineering
+
+install -m 755 -d %{buildroot}%{_datadir}/appdata/
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/org.sigrok.Pulseview.appdata.xml
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README HACKING
 %{_bindir}/*
 %{_mandir}/man1/pulseview.*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/apps/pulseview*
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/org.sigrok.Pulseview.appdata.xml
 
 %changelog