diff --git a/standard-icon.patch b/standard-icon.patch
new file mode 100644
index 0000000..782df9a
--- /dev/null
+++ b/standard-icon.patch
@@ -0,0 +1,24 @@
+diff -up yelp-2.23.1/src/yelp-window.c.standard-icon yelp-2.23.1/src/yelp-window.c
+--- yelp-2.23.1/src/yelp-window.c.standard-icon	2008-06-20 12:11:50.000000000 -0400
++++ yelp-2.23.1/src/yelp-window.c	2008-06-20 12:12:07.000000000 -0400
+@@ -2487,7 +2487,7 @@ window_about_cb (GtkAction *action, Yelp
+ 			   "copyright", copyright,
+ 			   "authors", authors,
+ 			   "translator-credits", translator_credits,
+-			   "logo-icon-name", "gnome-help",
++			   "logo-icon-name", "help-browser",
+ 			   NULL);
+ }
+ 
+diff -up yelp-2.23.1/yelp.desktop.in.in.standard-icon yelp-2.23.1/yelp.desktop.in.in
+--- yelp-2.23.1/yelp.desktop.in.in.standard-icon	2008-06-20 12:06:37.000000000 -0400
++++ yelp-2.23.1/yelp.desktop.in.in	2008-06-20 12:06:56.000000000 -0400
+@@ -3,7 +3,7 @@ _Name=Help
+ _Comment=Get help with GNOME
+ OnlyShowIn=GNOME;
+ Exec=yelp
+-Icon=gnome-help
++Icon=help-browser
+ StartupNotify=true
+ Terminal=false
+ Type=Application
diff --git a/yelp.spec b/yelp.spec
index 5474212..9ea9500 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -29,18 +29,14 @@ Patch2: yelp-2.13.2-add-mime-handling.patch
 Patch3: yelp-2.15.91-use-pango.patch 
 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
 Patch6: hp.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=499744
-Patch7: yelp-2.20.0-xulrunner.patch
-Patch8: yelp-2.20.0-xulrunner2.patch
-Patch9: yelp-2.21.2-libxul.patch
-
-# RH bug #437328 / GNOME bug #511244
-Patch10: yelp-2.22.0-beagle-search.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
 
+Patch11: standard-icon.patch
+
+
 License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,11 +92,7 @@ one central tool.
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
 %patch6 -p1 -b .hp
-%patch7 -p1 -b .xl
-%patch8 -p1 -b .xl2
-%patch9 -p1 -b .libxul
-%patch10 -p1 -b .beagle-search
-
+%patch11 -p1 -b .standard-icon
 
 %build
 %configure 			\
@@ -164,6 +156,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Fri Jun 20 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.1-2
+- Use a standard icon name in the desktop file
+
 * Tue Jun 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.1-1
 - Update to 2.23.1