diff --git a/.cvsignore b/.cvsignore
index 9c16cf8..c15dad9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rsync-2.5.0.tar.gz
+rsync-2.5.4.tar.gz
diff --git a/rsync.spec b/rsync.spec
index 66e6e53..36f95b5 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,13 +1,13 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
-Version: 2.5.0
+Version: 2.5.4
 Release: 1
 Group: Applications/Internet
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-Patch0: rsync-2.5.0-maxdel.patch
+Patch0: rsync-2.5.4-maxdel.patch
 Patch1: rsync-2.4.6-segv.patch
-Patch2: rsync-2.5.0-build.patch
+Patch2: rsync-2.5.4-moresignage.patch
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 Copyright: GPL
@@ -25,15 +25,12 @@ package.
 %setup -q
 %patch0 -p1 -b .maxdel
 %patch1 -p1 -b .segv
-%patch2 -p1 -b .build
+%patch2 -p1 -b .moresignage
 
 %build
 %configure
 
-make 
-
-rsync_enable_ssh_tests=true make check
-rm -rf testtmp
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +44,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING csprotocol.txt INSTALL NEWS README TODO tech_report.tex
+%doc COPYING README tech_report.tex
 %config(noreplace) /etc/xinetd.d/rsync
 %{_prefix}/bin/rsync
 %{_mandir}/man1/rsync.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
-* Fri Nov 30 2001 Bill Nottingham <notting@redhat.com>
-- update to 2.5.0
+* Wed Mar 13 2002 Bill Nottingham <notting@redhat.com> 2.5.4-1
+- update to 2.5.4, do assorted patchmerging
+
+* 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 Aug 17 2001 Bill Nottingham <notting@redhat.com>
 - fix segfault on weird arguments (#51801)
diff --git a/sources b/sources
index 707d033..135f0a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57e1a945afbb2e63f58919a7de9c6885  rsync-2.5.0.tar.gz
+cdea35a14fe8d01fef87336cc368da9a  rsync-2.5.4.tar.gz