diff --git a/.cvsignore b/.cvsignore
index 10c1b77..f027b47 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yp-tools-2.7.tar.bz2
+yp-tools-2.8.tar.bz2
diff --git a/sources b/sources
index f1aabe4..d8d0980 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d8d2c1c8b4a7e2027215aebe086f651  yp-tools-2.7.tar.bz2
+4a6792c367a3e01e4af7b07f449039e9  yp-tools-2.8.tar.bz2
diff --git a/yp-tools-2.7-md5.patch b/yp-tools-2.7-md5.patch
index ccfd0b1..df823f1 100644
--- a/yp-tools-2.7-md5.patch
+++ b/yp-tools-2.7-md5.patch
@@ -1,5 +1,5 @@
---- yp-tools-2.7/src/yppasswd.c.md5	Tue Jun 11 06:26:00 2002
-+++ yp-tools-2.7/src/yppasswd.c	Tue Jun 11 06:30:18 2002
+--- yp-tools-2.8/src/yppasswd.c.orig	2002-12-05 08:49:20.000000000 -0500
++++ yp-tools-2.8/src/yppasswd.c	2003-04-23 14:58:13.000000000 -0400
 @@ -49,6 +49,8 @@
  #include <locale.h>
  #include <libintl.h>
@@ -9,7 +9,7 @@
  #include <sys/stat.h>
  #include <rpcsvc/yp_prot.h>
  #include <rpcsvc/ypclnt.h>
-@@ -436,11 +438,44 @@
+@@ -436,11 +438,44 @@ verifypassword (struct passwd *pwd, char
  
  #endif
  
@@ -54,7 +54,7 @@
    struct yppasswd yppwd;
    struct passwd *pwd;
    CLIENT *clnt;
-@@ -451,6 +486,8 @@
+@@ -451,6 +486,8 @@ main (int argc, char **argv)
    bindtextdomain (PACKAGE, LOCALEDIR);
    textdomain (PACKAGE);
  
@@ -63,7 +63,7 @@
    if ((s = strrchr (argv[0], '/')) != NULL)
      progname = s + 1;
    else
-@@ -642,6 +679,9 @@
+@@ -642,6 +679,9 @@ main (int argc, char **argv)
        cp = stpcpy (hashpass, "##");
        strcpy (cp, pwd->pw_name);
  
@@ -73,7 +73,7 @@
        /* We can't check the password with shadow passwords enabled. We
         * leave the checking to yppasswdd */
        if (uid != 0 && strcmp (pwd->pw_passwd, "x") != 0 &&
-@@ -675,13 +715,11 @@
+@@ -676,13 +716,11 @@ main (int argc, char **argv)
  
    if (p_flag)
      {
@@ -88,7 +88,7 @@
  
        buf = (char *) malloc (129);
  
-@@ -732,9 +770,15 @@
+@@ -733,9 +771,15 @@ main (int argc, char **argv)
  	    }
  	}
  
diff --git a/yp-tools.spec b/yp-tools.spec
index 1b47650..9be8cb3 100644
--- a/yp-tools.spec
+++ b/yp-tools.spec
@@ -1,13 +1,12 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
-Version: 2.7
-Release: 5
+Version: 2.8
+Release: 2
 License: GPL
 Group: System Environment/Base
 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
+Url: http://www.linux-nis.org/nis/yp-tools/index.html
 Patch1: yp-tools-2.7-md5.patch
-Patch2: yp-tools-2.7-terminate.patch
 Obsoletes: yppasswd, yp-clients
 Requires: ypbind
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -35,7 +34,6 @@ you'll need to install the ypserv package on one machine on the network.
 %prep
 %setup -q
 %patch1 -p1 -b .md5
-%patch2 -p1 -b .terminate
 
 %build
 %configure --disable-domainname
@@ -61,6 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Apr 23 2003 Steve Dickson <SteveD@RedHat.com>
+- Update to 2.7 from upstream
+- Updated yppasswd md5 patch
+
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt