diff --git a/.cvsignore b/.cvsignore
index 61d1eb8..8192ae1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-netkit-tftp-0.17-pre20000412.tar.gz
+netkit-tftp-0.17.tar.gz
 tftp-hpa-0.14.tar.gz
diff --git a/sources b/sources
index 030b2a8..c95bef1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bb849fd0c3af8a7fa24361ffcb6647ea  netkit-tftp-0.17-pre20000412.tar.gz
+b7262c798e2ff50e29c2ff50dfd8d6a8  netkit-tftp-0.17.tar.gz
 b8d0594c500c672d5d7861b7aab5ef26  tftp-hpa-0.14.tar.gz
diff --git a/tftp.spec b/tftp.spec
index 19e249b..9c7bab5 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -1,15 +1,15 @@
-%define	_snapshot	-pre20000412
-
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: 0.17
-Release: 5
+Release: 9
 Copyright: BSD
 Group: Applications/Internet
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-tftp-%{version}%{_snapshot}.tar.gz
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-%{version}.tar.gz
 Source1: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-0.14.tar.gz
 Source2: tftp-xinetd
-Requires: xinetd
+Patch0: tftp-hpa-0.14-bug18128.patch
+Patch1: tftp-hpa-0.14-tftpd.patch
+Patch2:	tftp-hpa-0.14-tftpd-manpage.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -33,7 +33,10 @@ enabled unless it is expressly needed.  The TFTP server is run from
 /etc/xinetd.d/tftp, and is disabled by default on Red Hat Linux systems.
 
 %prep
-%setup -q -n netkit-tftp-%{version}%{_snapshot} -a 1
+%setup -q -n netkit-tftp-%{version} -a 1
+%patch0 -p1 -b .bug18128
+%patch1 -p1 -b .bug23725
+%patch2 -p1 -b .oldman
 
 chmod +x  tftp-hpa-0.14/configure
 
@@ -70,11 +73,16 @@ make -C tftp-hpa-0.14/tftpd INSTALLROOT=${RPM_BUILD_ROOT} \
     SBINDIR=%{_sbindir} MANDIR=%{_mandir} \
 	install
 install -m755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/
-install -m644 ${RPM_SOURCE_DIR}/tftp-xinetd ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
+install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
 
-%post
+%post server
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 
+%postun server
+if [ $1 = 0 ]; then
+    /sbin/service xinetd reload > /dev/null 2>&1 || :
+fi
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -85,11 +93,30 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files server
 %defattr(-,root,root)
-%config %{_sysconfdir}/xinetd.d/tftp
+%config(noreplace) %{_sysconfdir}/xinetd.d/tftp
 %{_sbindir}/in.tftpd
 %{_mandir}/man8/*
 
 %changelog
+* Thu Feb 08  2001 Helge Deller <hdeller@redhat.de>
+- changed "wait" in xinetd file to "yes" (hpa-tftpd forks and exits) (#26467)
+- fixed hpa-tftpd to handle files greater than 32MB (#23725)
+- added "-l" flag to hpa-tftpd for file-logging (#26467)
+- added description for "-l" to the man-page 
+
+* Thu Feb 08  2001 Helge Deller <hdeller@redhat.de>
+- updated tftp client to 0.17 stable (#19640),
+- drop dependency on xinetd for tftp client (#25051),
+
+* Wed Jan 17 2001 Jeff Johnson <jbj@redhat.com>
+- xinetd shouldn't wait on tftp (which forks) (#23923).
+
+* Sat Jan  6 2001 Jeff Johnson <jbj@redhat.com>
+- fix to permit tftp put's (#18128).
+- startup as root with chroot to /tftpboot with early reversion to nobody
+  is preferable to starting as nobody w/o ability to chroot.
+- %%post is needed by server, not client. Add %%postun for erasure as well.
+
 * Wed Aug 23 2000 Nalin Dahyabhai <nalin@redhat.com>
 - default to being disabled