diff --git a/.cvsignore b/.cvsignore
index b455aac..c8e7bdc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-metacity-2.25.5.tar.bz2
+metacity-2.25.8.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index b6d981c..101cb91 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.25.5
-Release: 4%{?dist}
+Version: 2.25.8
+Release: 1%{?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
@@ -174,6 +174,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Nov 24 2008 Matthias Clasen  <mclasen@redhat.com> - 2.25.8-1
+- Update to 2.25.8
+
 * Sat Nov 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.25.5-4
 - Tweak %%summary and %%description
 - Fix BuildRequires
diff --git a/sources b/sources
index 2dc9d1e..3fe19a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bad30bc7a0e935a1dd0ed31f863dd05f  metacity-2.25.5.tar.bz2
+da7fabe176eb971516a5d56bd6f3633b  metacity-2.25.8.tar.bz2
diff --git a/stop-spamming-xsession-errors.patch b/stop-spamming-xsession-errors.patch
index 4e78017..864cf6e 100644
--- a/stop-spamming-xsession-errors.patch
+++ b/stop-spamming-xsession-errors.patch
@@ -1,14 +1,15 @@
-diff -up metacity-2.24.0/src/core/display.c~ metacity-2.24.0/src/core/display.c
---- metacity-2.24.0/src/core/display.c~	2008-08-18 08:29:06.000000000 -0400
-+++ metacity-2.24.0/src/core/display.c	2008-10-31 15:19:02.000000000 -0400
-@@ -3264,9 +3264,11 @@ meta_display_begin_grab_op (MetaDisplay 
+diff -up metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors metacity-2.25.8/src/core/display.c
+--- metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors	2008-11-23 00:28:37.000000000 -0500
++++ metacity-2.25.8/src/core/display.c	2008-11-24 21:40:33.000000000 -0500
+@@ -3264,10 +3264,12 @@ meta_display_begin_grab_op (MetaDisplay 
    
    if (display->grab_op != META_GRAB_OP_NONE)
      {
 +#if 0
-       meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
-                     op, window ? window->desc : "none", display->grab_op,
-                     display->grab_window ? display->grab_window->desc : "none");
+       if (window)
+         meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
+                       op, window->desc, display->grab_op,
+                       display->grab_window ? display->grab_window->desc : "none");
 +#endif
        return FALSE;
      }