diff --git a/.cvsignore b/.cvsignore
index acfc354..67d6ea1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yp-tools-2.5.tar.gz
+yp-tools-2.6.tar.bz2
diff --git a/sources b/sources
index d1a379b..0f7dc35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc54a96435f006cfa5280889e8c617e6  yp-tools-2.5.tar.gz
+3fa285adba6ec2e236d124fb02361303  yp-tools-2.6.tar.bz2
diff --git a/yp-tools.spec b/yp-tools.spec
index e0d6d8b..6b7e55f 100644
--- a/yp-tools.spec
+++ b/yp-tools.spec
@@ -1,11 +1,12 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
-Version: 2.5
-Release: 1
+Version: 2.6
+Release: 3
 License: GPL
 Group: System Environment/Base
-Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.gz
+Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
 Url: http://www-vt.uni-paderborn.de/~kukuk/linux/nis.html
+Patch1: yp-tools-2.6-passwd.patch
 Obsoletes: yppasswd, yp-clients
 Requires: ypbind
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -32,6 +33,7 @@ you'll need to install the ypserv package on one machine on the network.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --disable-domainname
@@ -57,6 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Fri Mar 22 2002 Alex Larsson <alexl@redhat.com> 2.6-3
+- Add patch that handles MD5 passwords and HPU/X password aging.
+- This should hopefully fix #19045 and #22667
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
 * Tue Jul 24 2001 Florian La Roche <Florian.LaRoche@redhat.de>
 - own /var/yp