diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml
new file mode 100644
index 0000000..c78ba48
--- /dev/null
+++ b/wireshark-mime-package.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-pcap">
+    <comment>Packet Capture</comment>
+    <generic-icon name="application-x-pcap"/>
+    <alias type="application/pcap"/>
+    <glob pattern="*.pcap"/>
+  </mime-type>
+</mime-info>
diff --git a/wireshark.desktop b/wireshark.desktop
index 6efd694..fb4240a 100644
--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -7,8 +7,9 @@ Comment=Wireshark traffic and network analyzer
 Comment[fi]=Verkkoanalysaattori
 Comment[sv]=Nätverkstrafikanalysator
 TryExec=wireshark
-Exec=wireshark
-Icon=wireshark.png
+Exec=wireshark %f
+Icon=wireshark
 Terminal=false
 Type=Application
 Categories=X-Red-Hat-Extra;Application;Network;GTK;
+MimeType=application/x-pcap;
diff --git a/wireshark.spec b/wireshark.spec
index 8d57d2f..85194a7 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -30,6 +30,12 @@ Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
 Source4:	wireshark-autoconf.m4
+Source5:	wireshark-mime-package.xml
+Source6:	wiresharkdoc-16x16.png
+Source7:	wiresharkdoc-32x32.png
+Source8:	wiresharkdoc-48x48.png
+Source9:	wiresharkdoc-256x256.png
+
 Patch1:		wireshark-nfsv4-opts.patch
 Patch2:		wireshark-0.99.7-path.patch
 Patch3:		wireshark-1.2.4-enable_lua.patch
@@ -223,6 +229,14 @@ EOF
 mkdir -p "${RPM_BUILD_ROOT}%{_datadir}/aclocal"
 cp "%{SOURCE4}" "${RPM_BUILD_ROOT}%{_datadir}/aclocal/wireshark.m4"
 
+# Install desktop stuff
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{icons/gnome/{16x16,32x32,48x48,256x256}/mimetypes,mime/packages}
+install -m 644 -T %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/wireshark.xml
+install -m 644 -T %{SOURCE6} $RPM_BUILD_ROOT/%{_datadir}/icons/gnome/16x16/mimetypes/application-x-pcap.png
+install -m 644 -T %{SOURCE7} $RPM_BUILD_ROOT/%{_datadir}/icons/gnome/32x32/mimetypes/application-x-pcap.png
+install -m 644 -T %{SOURCE8} $RPM_BUILD_ROOT/%{_datadir}/icons/gnome/48x48/mimetypes/application-x-pcap.png
+install -m 644 -T %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/icons/gnome/256x256/mimetypes/application-x-pcap.png
+
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
 
@@ -236,6 +250,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%post gnome
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/gnome || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+
+%postun gnome
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/gnome || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+fi
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README* 
@@ -293,7 +321,8 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 22 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.1-1
 - upgrade to 1.4.1
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.4.1.html
-- Own the %%{_libdir}/wireshark dir
+- Own the %%{_libdir}/wireshark dir (#644508)
+- associate *.pcap files with wireshark (#641163)
 
 * Wed Sep 29 2010 jkeating - 1.4.0-2
 - Rebuilt for gcc bug 634757
diff --git a/wiresharkdoc-16x16.png b/wiresharkdoc-16x16.png
new file mode 100644
index 0000000..50acd67
Binary files /dev/null and b/wiresharkdoc-16x16.png differ
diff --git a/wiresharkdoc-24x24.png b/wiresharkdoc-24x24.png
new file mode 100644
index 0000000..6db9ef4
Binary files /dev/null and b/wiresharkdoc-24x24.png differ
diff --git a/wiresharkdoc-256x256.png b/wiresharkdoc-256x256.png
new file mode 100644
index 0000000..8b6fa4a
Binary files /dev/null and b/wiresharkdoc-256x256.png differ
diff --git a/wiresharkdoc-32x32.png b/wiresharkdoc-32x32.png
new file mode 100644
index 0000000..80b712b
Binary files /dev/null and b/wiresharkdoc-32x32.png differ
diff --git a/wiresharkdoc-48x48.png b/wiresharkdoc-48x48.png
new file mode 100644
index 0000000..c58e190
Binary files /dev/null and b/wiresharkdoc-48x48.png differ