diff --git a/.cvsignore b/.cvsignore
index e3a60c6..463f549 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-1.5.7.tar.bz2
+evolution-1.5.8.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 1dcfde9..c3811ff 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,12 +1,13 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.1.8
-%define gtkhtml_version 3.1.12
+%define gal_version 2:2.1.9
+%define gtkhtml_version 3.1.14
 %define soup_version 2.1.9
-%define eds_version 0.0.92
+%define eds_version 0.0.93
 %define use_mozilla_nss 1
 %define evo_major 1.5
+%define libbonoboui_version 2.4.2
 
 %if %{use_mozilla_nss}
 %define mozilla_version 1.6
@@ -23,15 +24,14 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 1.5.7
-Release: 3
+Version: 1.5.8
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
 Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/1.5/%{name}-%{version}.tar.bz2
 
 # patches pulled from upstream CVS
-Patch600: evolution-1.5.7-fix_emfv_signal.patch
 
 # Red Hat Linux specific patches
 #Patch11: evolution-1.3.2-redhatify.patch
@@ -42,7 +42,6 @@ Patch600: evolution-1.5.7-fix_emfv_signal.patch
 Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 
 # patches sent upstream
-Patch601: evolution-1.5.7-fix_defaults_for_gcc34.patch
 
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
@@ -71,13 +70,14 @@ Requires: libgal2 >= %{gal_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-spell >= 1.0.2
 Requires: gtk2 >= 2.4.0
+Requires: libbonoboui >= %{libbonoboui_version}
 
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: libgal2-devel >= %{gal_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: libbonobo-devel >= 2.0
-BuildRequires: libbonoboui-devel >= 2.0
+BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgnomecanvas-devel >= 2.0
@@ -145,16 +145,13 @@ Development files needed for building things which link against evolution.
 %patch98 -p1 -b .ldaphack
 
 # patches sent upstream
-%patch601 -p1 -b .fix_defaults_for_gcc34
 
 #patch200 -p1 -b .commandlength
 
 #patch500 -p0 -b .wombatsm
 
-# Already in CVS on 1-5-branch:
-%patch600 -p1 -b .fix_emfv_signal
-
-%patch700 -p1 -b .filechooser
+# Patch disabled for now
+#%patch700 -p1 -b .filechooser
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -299,10 +296,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
-* Tue May  4 2004 David Malcolm <dmalcolm@boston.redhat.com> - 1.5.7-3
+* Fri May 21 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.8-1
+- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now
+
+* Tue May  4 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-3
 - Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4
 
-* Thu Apr 22 2004 David Malcolm <dmalcolm@boston.redhat.com> - 1.5.7-2
+* Thu Apr 22 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-2
 - added emfv signal fix patch and fix for defaults in switch statements on gcc3.4
 
 * Wed Apr 21 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-1
diff --git a/sources b/sources
index c93fa5d..de35991 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a553123fb726360a853f32fd1003ef3b  evolution-1.5.7.tar.bz2
+a09ca19c5d2bbe332c2bd493b1e9328b  evolution-1.5.8.tar.bz2