diff --git a/.cvsignore b/.cvsignore
index 58d410f..e3537a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 netkit-tftp-0.17.tar.bz2
-tftp-hpa-0.16.tar.bz2
+tftp-hpa-0.17.tar.bz2
diff --git a/sources b/sources
index 7f74972..eafc8a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 dcc9f871b0783d26a13a48d15f03b820  netkit-tftp-0.17.tar.bz2
-89b7eabdce87d551246d7a4ccaefda8a  tftp-hpa-0.16.tar.bz2
+dbd759d9bf70bcda04bfe4486b254e2d  tftp-hpa-0.17.tar.bz2
diff --git a/tftp.spec b/tftp.spec
index 7bab167..51691c4 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -1,16 +1,19 @@
+%define tftp_version 0.17
+%define tftp_hpa_version 0.17
+
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
-Version: 0.17
-Release: 12
+Version: %{tftp_version}
+Release: 13
 Copyright: BSD
 Group: Applications/Internet
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-%{version}.tar.bz2
-Source1: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-0.16.tar.bz2
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-%{tftp_version}.tar.bz2
+Source1: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2
 Source2: tftp-xinetd
 Patch0: tftp-netkit-tftp-0.17-segsize.patch
 Patch1: tftp-hpa-0.14-tftpd-ushort.patch
-Patch2:	tftp-hpa-0.14-tftpd-logging.patch
-Patch3:	tftp-hpa-0.14-tftpd-manpage.patch
+Patch2:	tftp-hpa-0.17-tftpd-logging.patch
+Patch3:	tftp-hpa-0.17-tftpd-manpage.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -36,7 +39,7 @@ enabled unless it is expressly needed.  The TFTP server is run from
 %prep
 %setup -q -n netkit-tftp-%{version} -a 1
 %patch0 -p1 -b .bug29529
-cd tftp-hpa-0.16
+cd tftp-hpa-%{tftp_hpa_version}
 %patch1 -p2 -b .bug23725
 %patch2 -p2 -b .logging
 %patch3 -p2 -b .oldman
@@ -53,7 +56,7 @@ perl -pi -e '
 
 make
 
-cd tftp-hpa-0.16
+cd tftp-hpa-%{tftp_hpa_version}
 %configure
 make -C tftpd
 
@@ -64,7 +67,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 
 make INSTALLROOT=${RPM_BUILD_ROOT} install
-make -C tftp-hpa-0.16/tftpd INSTALLROOT=${RPM_BUILD_ROOT} \
+make -C tftp-hpa-%{tftp_hpa_version}/tftpd INSTALLROOT=${RPM_BUILD_ROOT} \
     SBINDIR=%{_sbindir} MANDIR=%{_mandir} \
 	install
 install -m755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/
@@ -93,6 +96,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jun 12 2001 Helge Deller <hdeller@redhat.de> (0.17-13)
+- updated tftp-hpa source to tftp-hpa-0.17
+- tweaked specfile with different defines for tftp-netkit and tftp-hpa version
+- use hpa's tftpd.8 man page instead of the netkits one
+
 * Mon May 07 2001 Helge Deller <hdeller@redhat.de>
 - rebuilt in 7.1.x