diff --git a/.gitignore b/.gitignore
index 232f522..20e9d09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ garcon-0.1.1.tar.bz2
 /garcon-0.1.2.tar.bz2
 /garcon-0.1.4.tar.bz2
 /garcon-0.1.5.tar.bz2
+/internet-mail-24.png
+/internet-mail-48.png
diff --git a/garcon.spec b/garcon.spec
index 1dd6b7d..90050da 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -4,7 +4,7 @@
 
 Name:           garcon
 Version:        0.1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Implementation of the freedesktop.org menu specification
 
 Group:          System Environment/Libraries
@@ -13,6 +13,9 @@ Group:          System Environment/Libraries
 License:        LGPLv2+ and GFDL
 URL:            http://xfce.org/
 Source0:        http://archive.xfce.org/src/libs/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+# internet-mail icon taken from GNOME, license is LGPLv3
+Source1:        internet-mail-24.png
+Source2:        internet-mail-48.png
 Patch0:         garcon-0.1.5-redhat-menus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +67,29 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
+install -Dpm 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png
+install -Dpm 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -79,6 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
 %{_libdir}/*.so.*
 %{_datadir}/desktop-directories/xfce-other.directory
+%{_datadir}/icons/hicolor/*/apps/internet-mail.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -89,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Mar 29 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.5-4
+- Add xfce4-mail icon for exo-mail-reader (#678706)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d3a0e4f..a1467dd 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 c4fd42082b4ae157aa4c7abb6d6570aa  garcon-0.1.5.tar.bz2
+5967338f62bcfc456039ca2d4591506f  internet-mail-24.png
+7372d488df90bb3595f27bbde89bd986  internet-mail-48.png