diff --git a/evo-composer.patch b/evo-composer.patch
new file mode 100644
index 0000000..e8a2062
--- /dev/null
+++ b/evo-composer.patch
@@ -0,0 +1,13 @@
+diff -up gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer gtk+-2.13.6/gtk/gtkadjustment.c
+--- gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer	2008-08-11 17:11:17.000000000 -0400
++++ gtk+-2.13.6/gtk/gtkadjustment.c	2008-08-11 17:11:47.000000000 -0400
+@@ -359,7 +359,8 @@ gtk_adjustment_set_value (GtkAdjustment 
+ {
+   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+ 
+-  value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
++  value = MIN (value, adjustment->upper - adjustment->page_size);
++  value = MAX (value, adjustment->lower);
+ 
+   if (value != adjustment->value)
+     {
diff --git a/gtk2.spec b/gtk2.spec
index 396f1d8..7ed9537 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 Patch2: workaround.patch
 # from upstream svn
 Patch3: menu-breakage.patch
+# from upstream svn
+Patch4: evo-composer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -118,6 +120,7 @@ docs for the GTK+ widget toolkit.
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .menu-breakage
+%patch4 -p1 -b .evo-composer
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Aug 11 2008 Matthias Clasen <mclasen@redhat.com> - 2.13.6-3
+- Fix evolution composer breakage
+
 * Sat Aug  9 2008 Matthias Clasen <mclasen@redhat.com> - 2.13.6-2
 - Fix menu breakage