diff --git a/.cvsignore b/.cvsignore
index f87858e..eafa251 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ypserv-2.3.tar.bz2
+ypserv-2.5.tar.bz2
diff --git a/sources b/sources
index bc10ec2..077866e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25a0a8cf577162162524b554c4515d00  ypserv-2.3.tar.bz2
+392d2ce6c3e1ccb1503b7d943b43ab7e  ypserv-2.5.tar.bz2
diff --git a/ypserv-2.5-redhat.patch b/ypserv-2.5-redhat.patch
new file mode 100644
index 0000000..c00ce0d
--- /dev/null
+++ b/ypserv-2.5-redhat.patch
@@ -0,0 +1,13 @@
+--- ypserv-2.5/scripts/ypMakefile.in.redhat	Mon May 27 09:00:27 2002
++++ ypserv-2.5/scripts/ypMakefile.in	Thu Aug 15 14:39:31 2002
+@@ -101,8 +104,8 @@
+ # If you don't want some of these maps built, feel free to comment
+ # them out from this list.
+ 
+-all:  passwd group hosts rpc services netid protocols netgrp mail \
+-	shadow publickey # networks ethers bootparams printcap \
++all:  passwd group hosts rpc services netid protocols mail \
++	# netgrp shadow publickey networks ethers bootparams printcap \
+ 	# amd.home auto.master auto.home auto.local passwd.adjunct \
+ 	# timezone locale netmasks
+ 
diff --git a/ypserv.spec b/ypserv.spec
index 9878630..38d71b4 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -3,8 +3,8 @@
 Summary: The NIS (Network Information Service) server.
 Url: http://www.suse.de/~kukuk
 Name: ypserv
-Version: 2.3
-Release: 4
+Version: 2.5
+Release: 1
 Copyright: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -13,10 +13,10 @@ Source2: ypserv-yppasswdd.init
 Source3: ypserv-ypxfrd.init
 Requires: gawk, make, portmap, bash >= 2.0
 Prereq: /sbin/chkconfig /sbin/service
-Patch0: ypserv-2.3-redhat.patch
+Patch0: ypserv-2.5-redhat.patch
 Patch1: ypserv-2.1-syslog.patch
 Patch2: ypserv-2.1-path.patch
-Patch3: ypserv-2.3-manpage.patch
+Patch3: ypserv-2.5-nfsnobody.patch
 Obsoletes: yppasswd
 BuildRequires: gdbm-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -42,7 +42,7 @@ machines.
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .syslog
 %patch2 -p1 -b .path
-%patch3 -p1 -b .manpage
+%patch3 -p1 -b .nfsnobody
 
 %build
 cp etc/README etc/README.etc
@@ -122,6 +122,10 @@ exit 0
 %{_includedir}/*/*
 
 %changelog
+* Thu Aug 15 2002 Alexander Larsson <alexl@redhat.com>
+- Update to 2.5, fixes memleak
+- remove manpage patch since it was already fixed upstream
+
 * Thu Aug 15 2002 Alexander Larsson <alexl@redhat.com>
 - Fix ypserv.conf manpage, bug #69785
 - Don't leak nfsnobody into nfs maps, bug #71515