diff --git a/.cvsignore b/.cvsignore
index 3210d48..4d42394 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.7.4.tar.bz2
+evolution-data-server-1.7.90.1.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 67dfbd1..ecd651b 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -21,7 +21,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.4
+Version: 1.7.90.1
 Release: 5
 License: LGPL
 Group: System Environment/Libraries
@@ -38,12 +38,8 @@ Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Gnome.org bug #344693
-Patch15: evolution-data-server-1.7.4-with-libdb-fix.patch
-
 # Gnome.org bug #348725
-# Getting ahead of ourselves... reenable on upgrade.
-#Patch16: evolution-data-server-1.7.90.1-missing-function-decl.patch
+Patch15: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -126,8 +122,7 @@ evolution-data-server.
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
-%patch15 -p1 -b .with-libdb-fix
-#patch16 -p1 -b .missing-function-decl
+%patch15 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -330,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Aug  4 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.90.1-5
+- Update to 1.7.90.1 (again)
+
 * Thu Aug  3 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.4-5
 - Remove patches for Gnome.org bug #309079 (rejected upstream).
 - One of these patches was causing RH bug #167157.
diff --git a/sources b/sources
index 57677dd..fa1e66a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2
+07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2