diff --git a/.cvsignore b/.cvsignore
index ae1c5bd..9c16cf8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rsync-2.4.6.tar.gz
+rsync-2.5.0.tar.gz
diff --git a/rsync.spec b/rsync.spec
index 4d9c386..66e6e53 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,18 +1,13 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
-Version: 2.4.6
-Release: 13s.1
+Version: 2.5.0
+Release: 1
 Group: Applications/Internet
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-Patch0: rsync-2.4.2-maxdel.patch
-Patch1: rsync-nohang.patch
-Patch2: rsync-2.4.6-ipv6.patch
-Patch3: rsync-2.4.6-segv.patch
-Patch4: rsync-2.4.6-unsigned.dif
-Patch5: rsync-2.4.6-moresignage.patch
-Patch6: rsync-zlib.patch
-Patch7: rsync-setgroups.patch
+Patch0: rsync-2.5.0-maxdel.patch
+Patch1: rsync-2.4.6-segv.patch
+Patch2: rsync-2.5.0-build.patch
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 Copyright: GPL
@@ -29,20 +24,16 @@ package.
 %prep
 %setup -q
 %patch0 -p1 -b .maxdel
-%patch1 -p0 -b .nohang
-%patch2 -p1 -b .ipv6
-%patch3 -p1 -b .segv
-%patch4 -p1 -b .unsigned
-%patch5 -p1 -b .moresignage
-cd zlib
-%patch6 -p1 -b .zlib
-cd ..
-%patch7 -p1 -b .setgroups
+%patch1 -p1 -b .segv
+%patch2 -p1 -b .build
 
 %build
 %configure
 
-make
+make 
+
+rsync_enable_ssh_tests=true make check
+rm -rf testtmp
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,30 +47,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING README tech_report.tex
+%doc COPYING csprotocol.txt INSTALL NEWS README TODO tech_report.tex
 %config(noreplace) /etc/xinetd.d/rsync
 %{_prefix}/bin/rsync
 %{_mandir}/man1/rsync.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
-* Wed Mar 18 2003 D. Marlin <dmarlin@redhat.com>
-- new s390 release number and rebuild for s390 (bug #85960)
-
-* Wed Feb 20 2002 Bill Nottingham <notting@redhat.com>
-- fix --address (#60127)
-- call setgroups before dropping privs (<mkp@samba.org>)
-
-* Mon Jan 28 2002 Bill Nottingham <notting@redhat.com>
-- fix some errors in the unsigned patch
-
-* Sun Jan 27 2002 Bill Nottingham <notting@redhat.com>
-- rebuild to get proper LFS_CFLAGS
-
-* Wed Jan 23 2002 Bill Nottingham <notting@redhat.com>
-- fix some signed/unsigned issues (<krahmer@suse.de>)
-- tweak ipv6 patch (#55337, <john.l.villalovos@intel.com>)
-- make xinetd file %config(noreplace)
+* Fri Nov 30 2001 Bill Nottingham <notting@redhat.com>
+- update to 2.5.0
 
 * Fri Aug 17 2001 Bill Nottingham <notting@redhat.com>
 - fix segfault on weird arguments (#51801)
diff --git a/sources b/sources
index eaae4fd..707d033 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ceb5e659f257c89569664c780b6fa6c  rsync-2.4.6.tar.gz
+57e1a945afbb2e63f58919a7de9c6885  rsync-2.5.0.tar.gz