diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch
new file mode 100644
index 0000000..e53d67a
--- /dev/null
+++ b/evolution-2.30.1-help-contents.patch
@@ -0,0 +1,18 @@
+diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c
+--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents	2010-04-26 09:13:18.000000000 -0400
++++ evolution-2.30.1.2/shell/e-shell-window-actions.c	2010-05-07 21:29:06.269059830 -0400
+@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo
+ 	if (path == NULL)
+ 		gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
+ 	g_free (path);
++
++	/* Viewing user documentation requires the evolution-help
++	 * Fedora package.  Look for one of the files it installs. */
++	path = g_build_filename (
++		EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL);
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++	g_free (path);
+ }
+ 
+ static GList *
diff --git a/evolution.spec b/evolution.spec
index a74e266..4a72fbd 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,7 +40,7 @@
 
 Name: evolution
 Version: 2.31.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -63,6 +63,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# RH bug #589555
+Patch13: evolution-2.30.1-help-contents.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -170,6 +173,7 @@ Development files needed for building things which link against %{name}.
 Group: Applications/Productivity
 Summary: Help files for %{name}
 Requires: %{name} = %{version}-%{release}
+Requires: yelp
 BuildArch: noarch
 
 %description help
@@ -230,6 +234,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -p1 -b .help-contents
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -681,6 +686,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri May 07 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.1-2.fc14
+- Require yelp in evolution-help (RH bug #589555).
+- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
+  is not installed).
+
 * Mon May 03 2010 Milan Crha <mcrha@redhat.com> - 2.31.1-1.fc14
 - Update to 2.31.1