diff --git a/.cvsignore b/.cvsignore
index 7edd850..59b07e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.3.8.tar.bz2
+evolution-2.4.0.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 445f560..c604e2b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,8 +29,8 @@ ExcludeArch: ppc64
 %define exchange_support 1
 
 Name: evolution
-Version: 2.3.8
-Release: 4
+Version: 2.4.0
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -64,8 +64,6 @@ Patch108: evolution-2.3.5.1-fix-150458.patch
 # Fix for RH bug 164957 (was for 145552):
 Patch109: evolution-2.0.2-fix-145552.patch
 
-Patch110: evolution-2.3.8-fix-implicit-function-declarations.patch
-
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
 #Patch200: evolution-1.4.5-imap-command-length.patch
@@ -199,7 +197,6 @@ cd widgets/table
 %patch108 -p3 -b .fix-150458
 cd ../..
 %patch109 -p1 -b .fix-164957
-%patch110 -p1 -b .fix-implicit-function-declarations
 
 #patch200 -p1 -b .commandlength
 
@@ -372,6 +369,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Sep  7 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.0-1
+- 2.4.0
+- Removed patch to fix implicit function declarations (patch 110, added in 
+  2.3.8-1) as this is now upstream.
+
 * Thu Sep  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-4
 - Enable exchange support when configuring, so that the exchange-operations
   plugin gets built.
diff --git a/sources b/sources
index 524385d..2804428 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5972fbb96b36cd3420bf1390d63c551  evolution-2.3.8.tar.bz2
+c6b38b9a6ba920be5a859e9ed368508d  evolution-2.4.0.tar.bz2