diff --git a/.cvsignore b/.cvsignore
index a2b8271..8f64659 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -22,3 +22,4 @@ gtk+-2.8.3.tar.bz2
 gtk+-2.8.4.tar.bz2
 gtk+-2.8.5.tar.bz2
 gtk+-2.8.6.tar.bz2
+gtk+-2.8.7.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index ec6cc0b..faeb4bc 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.6
+%define base_version 2.8.7
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 6
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -24,10 +24,8 @@ Source1: update-scripts.tar.gz
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
-# Fixed in 2.8.7
-Patch1: gtk+-2.8.6-mimecache.patch
 # Backported from 2.10
-Patch2: gtk+-2.8.6-inputmethod.patch
+Patch1: gtk+-2.8.6-inputmethod.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -89,8 +87,7 @@ docs for the GTK+ widget toolkit.
 tar xzf %{SOURCE1}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .mimecache
-%patch2 -p0 -b .inputmethod
+%patch1 -p0 -b .inputmethod
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -259,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc tmpdocs/examples
 
 %changelog
+* Tue Nov 15 2005 Matthias Clasen <mclasen@redhat.com> 2.8.7-1
+- Update to 2.8.7
+
 * Tue Nov  8 2005 Matthias Clasen <mclasen@redhat.com> 2.8.6-6
 - Clean up spec file a bit
 
diff --git a/sources b/sources
index 2478cad..01a667b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2bcb9e3feb62ac895101cb8ee87ca49a  gtk+-2.8.6.tar.bz2
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
+d0f205f97fe6ae3ecb6eae7be5a68b39  gtk+-2.8.7.tar.bz2