diff --git a/metacity-dont-force-bell.patch b/metacity-dont-force-bell.patch
new file mode 100644
index 0000000..f538caf
--- /dev/null
+++ b/metacity-dont-force-bell.patch
@@ -0,0 +1,11 @@
+diff -up metacity-2.25.144/src/core/bell.c.no-more-brokkoli metacity-2.25.144/src/core/bell.c
+--- metacity-2.25.144/src/core/bell.c.no-more-brokkoli	2009-02-21 12:04:32.447950258 -0500
++++ metacity-2.25.144/src/core/bell.c	2009-02-21 12:04:41.191943469 -0500
+@@ -293,7 +293,6 @@ meta_bell_notify (MetaDisplay *display, 
+       ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
+       ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
+       ca_proplist_sets (p, CA_PROP_MEDIA_ROLE, "event");
+-      ca_proplist_sets (p, CA_PROP_CANBERRA_ENABLE, "1");
+ 
+       window = meta_display_lookup_x_window (display, xkb_bell_event->window);
+       if (!window && (display->focus_window) && (display->focus_window->frame))
diff --git a/metacity.spec b/metacity.spec
index 6b4d2d1..f75ded4 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.25.144
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.25/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -9,6 +9,8 @@ Patch0: default-theme.patch
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=557921
 Patch5: metacity-canberra.patch
+# fixed upstream
+Patch6: metacity-dont-force-bell.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -71,6 +73,7 @@ API. This package exists purely for technical reasons.
 %patch0 -p1 -b .default-theme
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .canberra
+%patch6 -p1 -b .dont-force-bell
 
 autoreconf -i -f
 
@@ -176,6 +179,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sat Feb 21 2009 Matthias Clasen  <mclasen@redhat.com> - 2.25.144-4
+- Don't force the bell (#486137)
+
 * Wed Feb 18 2009 Matthias Clasen  <mclasen@redhat.com> - 2.25.144-3
 - Update the theme patch to apply to the right file