diff --git a/.cvsignore b/.cvsignore
index 3dd215b..58445a1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.11.3.tar.bz2
+evolution-2.11.4.tar.bz2
diff --git a/evolution-2.11.3-fix-invalid-free.patch b/evolution-2.11.3-fix-invalid-free.patch
deleted file mode 100644
index 45a7937..0000000
--- a/evolution-2.11.3-fix-invalid-free.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-2.11.3/mail/em-folder-view.c.fix-invalid-free	2007-06-05 15:20:42.000000000 -0400
-+++ evolution-2.11.3/mail/em-folder-view.c	2007-06-05 15:20:51.000000000 -0400
-@@ -2930,7 +2930,7 @@ emfv_on_url_cb (GObject *emitter, const 
- 			camel_url_free(curl);
- 			camel_object_unref(cia);
- 		} else if (!strncmp (url, "##", 2)) {
--			nice_url = _("Click to hide/unhide addresses");
-+			nice_url = g_strdup (_("Click to hide/unhide addresses"));
- 		} else
- 			nice_url = g_strdup_printf (_("Click to open %s"), url);
- 	}
diff --git a/evolution-2.11.3-implicit-function-declaration.patch b/evolution-2.11.3-implicit-function-declaration.patch
deleted file mode 100644
index 554191a..0000000
--- a/evolution-2.11.3-implicit-function-declaration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- evolution-2.11.3/mail/mail-ops.h.implicit-function-declaration	2007-06-04 13:52:57.000000000 -0400
-+++ evolution-2.11.3/mail/mail-ops.h	2007-06-04 13:53:23.000000000 -0400
-@@ -156,6 +156,7 @@ void mail_prep_offline(const char *uri, 
- int mail_store_set_offline(CamelStore *store, gboolean offline,
- 			   void (*done)(CamelStore *, void *data),
- 			   void *data);
-+int mail_store_prepare_offline (CamelStore *store);
- 
- /* filter driver execute shell command async callback */
- void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);
diff --git a/evolution.spec b/evolution.spec
index 6732d19..fd4f60d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.3
-Release: 5%{?dist}
+Version: 2.11.4
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -131,15 +131,6 @@ Patch33: evolution-2.10.0-e-passwords.patch
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# Upstream really needs to use -Werror-implicit-function-declaration.
-Patch35: evolution-2.11.3-implicit-function-declaration.patch
-
-# Fix an invalid free in em-folder-view.c
-Patch36: evolution-2.11.3-fix-invalid-free.patch
-
-# GNOME bug #447727
-Patch37: evolution-2.11.3-e-clipped-label.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -279,9 +270,6 @@ Development files needed for building things which link against evolution.
 %patch32 -p1 -b .view-message-source
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .implicit-function-declaration
-%patch36 -p1 -b .fix-invalid-free
-%patch37 -p1 -b .e-clipped-label
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -715,6 +703,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jun 18 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.4-1.fc8
+- Update to 2.11.4
+- Remove patch for GNOME bug #447727 (fixed upstream).
+
 * Thu Jun 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-5.fc8
 - Add patch for GNOME bug #447727 (remove EClippedLabel).
 
diff --git a/sources b/sources
index 5e28d1d..d669b62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4aa1a1a4b4cf51d64eb259ae3769c8d0  evolution-2.11.3.tar.bz2
+003da7ba7f744d13e1c6f4d4c884b2ac  evolution-2.11.4.tar.bz2