diff --git a/.cvsignore b/.cvsignore
index 1681314..3070258 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.7.92.tar.bz2
+evolution-data-server-1.8.0.tar.bz2
diff --git a/evolution-data-server-1.8.0-no-gnome-common.patch b/evolution-data-server-1.8.0-no-gnome-common.patch
new file mode 100644
index 0000000..05e8d53
--- /dev/null
+++ b/evolution-data-server-1.8.0-no-gnome-common.patch
@@ -0,0 +1,11 @@
+--- evolution-data-server-1.5.4/configure.in.make_imap4_optional	2006-01-09 17:24:10.000000000 -0500
++++ evolution-data-server-1.5.4/configure.in	2006-01-09 17:24:12.000000000 -0500
+@@ -1093,8 +1103,6 @@
+ dnl CFLAGS and LIBS and stuff
+ dnl *************************
+ 
+-GNOME_COMPILE_WARNINGS(yes)
+-CFLAGS="$CFLAGS $WARN_CFLAGS"
+ case $CFLAGS in
+ *-Wall*)
+ 	# Turn off the annoying "comparison between signed and unsigned"
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index fa6ef58..4277428 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.92
-Release: 4%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -36,22 +36,19 @@ Patch10: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
 Patch11: evolution-1.4.4-ldap-x86_64-hack.patch
 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
 
-# RH bug #202329 / Gnome.org bug #351317
-Patch15: evolution-data-server-1.7.91-fix-edataserverui-libs.patch
+# Remove gnome-common macros from configure.in.
+# We do not ship gnome-common (or at least we're not supposed to).
+Patch14: evolution-data-server-1.8.0-no-gnome-common.patch
 
 # RH bug #202309
-Patch16: evolution-data-server-1.7.91-maybe-fix-crash.patch
-
-# Gnome.org bug #349847
-Patch17: evolution-data-server-1.7.92-uninitialized-gerror.patch
+Patch15: evolution-data-server-1.7.91-maybe-fix-crash.patch
 
 # RH bug #198935 / Gnome.org bug #350907
-Patch18: evolution-data-server-1.7.92-fix-fd-leak.patch
+Patch16: evolution-data-server-1.7.92-fix-fd-leak.patch
 
 # Gnome.org bug #353478
-Patch19: evolution-data-server-1.7.92-chain-finalize.patch
+Patch17: evolution-data-server-1.7.92-chain-finalize.patch
 
 ### Dependencies ###
 
@@ -133,12 +130,10 @@ evolution-data-server.
 %patch11 -p1 -b .ldaphack
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
-%patch14 -p1 -b .make_imap4_optional
-%patch15 -p1 -b .fix-edataserverui-libs
-%patch16 -p1 -b .maybe-fix-crash
-%patch17 -p1 -b .uninitialized-gerror
-%patch18 -p1 -b .fix-fd-leak
-%patch19 -p1 -b .chain-finalize
+%patch14 -p1 -b .no-gnome-common
+%patch15 -p1 -b .maybe-fix-crash
+%patch16 -p1 -b .fix-fd-leak
+%patch17 -p1 -b .chain-finalize
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -341,6 +336,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep  4 2006 Matthew Barnes <mbarnes@redhat.com> - 1.8.0-1.fc6
+- Update to 1.8.0
+- Remove evolution-data-server-1.5.4-make_imap4_optional.patch (fixed upstream)
+  and save remaining hunk as evolution-data-server-1.8.0-no-gnome-common.patch.
+- Remove patch for RH bug #202329 (fixed upstream).
+- Remove patch for Gnome.org bug #349847 (fixed upstream).
+
 * Tue Aug 29 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.92-4.fc6
 - Revise patch for RH bug #198935.
 - Add patch for Gnome.org bug #353478.
diff --git a/sources b/sources
index fb599ef..dfa198a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5cf9b7317b9b495e15b18586cacda6c  evolution-data-server-1.7.92.tar.bz2
+53f0885731440cb9cf0ca0601dd2105f  evolution-data-server-1.8.0.tar.bz2