diff --git a/evolution-2.21.4-bugzilla-component.patch b/evolution-2.21.4-bugzilla-component.patch
new file mode 100644
index 0000000..020dd05
--- /dev/null
+++ b/evolution-2.21.4-bugzilla-component.patch
@@ -0,0 +1,12 @@
+diff -up evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component evolution-2.21.4/data/evolution.desktop.in.in
+--- evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component	2008-01-05 18:39:45.000000000 -0500
++++ evolution-2.21.4/data/evolution.desktop.in.in	2008-01-05 18:39:59.000000000 -0500
+@@ -11,7 +11,7 @@ Categories=GNOME;GTK;Office;Email;Calend
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=Evolution
+-X-GNOME-Bugzilla-Component=Miscellaneous
++X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
+ X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-@DATASERVER_EXEC_VERSION@;evolution-exchange-storage;evolution-alarm-notify;
+ 
diff --git a/evolution.spec b/evolution.spec
index ca5674f..665c703 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.21.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -103,6 +103,9 @@ Patch22: evolution-2.9.3-source-path-entry.patch
 # GNOME bug #504030
 Patch23: evolution-2.21.4-too-noisy.patch
 
+# GNOME bug #507311
+Patch24: evolution-2.21.4-bugzilla-component.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -252,6 +255,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %patch21 -p1 -b .im-context-reset
 %patch22 -p1 -b .source-path-entry
 %patch23 -p1 -b .too-noisy
+%patch24 -p1 -b .bugzilla-component
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -684,6 +688,10 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Sat Jun 05 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.4-2.fc9
+- Add patch for GNOME bug #507311 (send Bug Buddy reports to the new
+  BugBuddyBugs Bugzilla component).
+
 * Mon Dec 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.4-1.fc9
 - Update to 2.21.4
 - Expunge unused patches.