diff --git a/.cvsignore b/.cvsignore
index 5a74db8..5137e1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rsync-2.6.6.tar.gz
+rsync-2.6.8.tar.gz
diff --git a/rsync.spec b/rsync.spec
index 1a191a1..705a2b7 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,13 +1,12 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
-Version: 2.6.6
-Release: 2.2.1
+Version: 2.6.8
+Release: 2
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-Patch0: rsync-2.6.6-xattr.patch
 
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
@@ -26,8 +25,8 @@ package.
 # TAG: for pre versions use
 # % setup -q -n rsync-%{version}pre1
 %setup -q
-patch -p0 < patches/acls.diff
-%patch0 -p1 -b .xattr
+patch -p1 < patches/acls.diff
+patch -p1 < patches/xattrs.diff
 
 %build
 rm -fr autom4te.cache
@@ -57,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon May 8 2006 Jay Fenlason <fenlason@redhat.com> 2.6.8-2
+- New upstream release
+- Use the upstream xattr patch instead of mine.  This closes
+  bz#190208 CVE-2006-2083 rsync buffer overflow issue
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.6.6-2.2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index ea1a5c1..9b6a499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30c4e2849cbeae93f55548453865c2f2  rsync-2.6.6.tar.gz
+082a9dba1f741e6591e5cd748a1233de  rsync-2.6.8.tar.gz