diff --git a/.cvsignore b/.cvsignore
index 1a48bd3..5fb930e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-evolution-data-server-1.6.0.tar.bz2
-evolution-data-server-1.6.1.tar.bz2
+evolution-data-server-1.7.1.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 3966e21..277abac 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -8,7 +8,7 @@
 %define orbit2_version 2.9.8
 %define libbonobo_version 2.4.2
 
-%define eds_base_version 1.6
+%define eds_base_version 1.8
 %define eds_api_version 1.2
 
 %define use_gtk_doc 0
@@ -20,8 +20,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.6.1
-Release: 3
+Version: 1.7.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -29,7 +29,7 @@ Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}
 #Patch2: fix_contact_leaks.patch
 Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
 #Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
-Patch5: evolution-data-server-1.3.5-nspr_fix.patch
+#Patch5: evolution-data-server-1.3.5-nspr_fix.patch
 
 # Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267)
 #Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
@@ -37,7 +37,9 @@ Patch5: evolution-data-server-1.3.5-nspr_fix.patch
 Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch102: evolution-data-server-1.3.8-fix-implicit-function-declarations
-Patch103: evolution-data-server-1.2.0-validatehelo.patch
+
+# Fixed upstream (Bug #336035)
+#Patch103: evolution-data-server-1.2.0-validatehelo.patch
 
 # Leak fixes by Mark G. Adams
 Patch200: gb-309079-attach-48376.patch
@@ -109,14 +111,14 @@ evolution-data-server.
 #%patch2 -p1 -b .fix_contact_leaks
 %patch3 -p1 -b .workaround-cal-backend-leak
 #%patch4 -p1 -b .fix-calendar-factory-GType
-%patch5 -p1 -b .fix_nspr
+#%patch5 -p1 -b .fix_nspr
 
 #%patch6 -p0 -b .calendar-optimisation-XB70267
 
 %patch98 -p1 -b .ldaphack
 %patch101 -p1 -b .fix_open_calendar_declaration
 %patch102 -p1 -b .fix-implicit-function-declarations
-%patch103 -p1 -b .validatehelo
+#%patch103 -p1 -b .validatehelo
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
@@ -317,6 +319,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 10 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.1-1
+- Update to 1.7.1
+- Bump eds_base_version from 1.6 to 1.8.
+- Disable evolution-data-server-1.2.0-validatehelo.patch (accepted upstream).
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 1.6.1-3
 - Avoid a multilib conflict
 
diff --git a/sources b/sources
index bb60f7b..8620b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4def6cad1dc3508b8df55e7e794db49  evolution-data-server-1.6.1.tar.bz2
+80addd969d9f5c60add348df8d98423e  evolution-data-server-1.7.1.tar.bz2