diff --git a/.cvsignore b/.cvsignore
index e69de29..61d1eb8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,2 @@
+netkit-tftp-0.17-pre20000412.tar.gz
+tftp-hpa-0.14.tar.gz
diff --git a/sources b/sources
index e69de29..030b2a8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+bb849fd0c3af8a7fa24361ffcb6647ea  netkit-tftp-0.17-pre20000412.tar.gz
+b8d0594c500c672d5d7861b7aab5ef26  tftp-hpa-0.14.tar.gz
diff --git a/tftp.spec b/tftp.spec
new file mode 100644
index 0000000..19e249b
--- /dev/null
+++ b/tftp.spec
@@ -0,0 +1,158 @@
+%define	_snapshot	-pre20000412
+
+Summary: The client for the Trivial File Transfer Protocol (TFTP).
+Name: tftp
+Version: 0.17
+Release: 5
+Copyright: BSD
+Group: Applications/Internet
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-tftp-%{version}%{_snapshot}.tar.gz
+Source1: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-0.14.tar.gz
+Source2: tftp-xinetd
+Requires: xinetd
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+The Trivial File Transfer Protocol (TFTP) is normally used only for
+booting diskless workstations.  The tftp package provides the user
+interface for TFTP, which allows users to transfer files to and from a
+remote machine.  This program and TFTP provide very little security,
+and should not be enabled unless it is expressly needed.
+
+%package server
+Group: System Environment/Daemons
+Summary: The server for the Trivial File Transfer Protocol (TFTP).
+Requires: xinetd
+
+%description server
+The Trivial File Transfer Protocol (TFTP) is normally used only for
+booting diskless workstations.  The tftp-server package provides the
+server for TFTP, which allows users to transfer files to and from a
+remote machine. TFTP provides very little security, and should not be
+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
+
+chmod +x  tftp-hpa-0.14/configure
+
+%build
+sh configure
+perl -pi -e '
+    s,^CC=.*$,CC=cc,;
+    s,^BINDIR=.*$,BINDIR=%{_bindir},;
+    s,^MANDIR=.*$,MANDIR=%{_mandir},;
+    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
+    ' MCONFIG
+
+make
+
+cd tftp-hpa-0.14
+sh configure --prefix=/usr
+perl -pi -e '
+    s,^CC=.*$,CC=cc,;
+    s,^BINDIR=.*$,BINDIR=%{_bindir},;
+    s,^MANDIR=.*$,MANDIR=%{_mandir},;
+    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
+    ' MCONFIG
+
+make -C tftpd
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+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.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
+
+%post
+/sbin/service xinetd reload > /dev/null 2>&1 || :
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-,root,root)
+%{_bindir}/tftp
+%{_mandir}/man1/*
+
+%files server
+%defattr(-,root,root)
+%config %{_sysconfdir}/xinetd.d/tftp
+%{_sbindir}/in.tftpd
+%{_mandir}/man8/*
+
+%changelog
+* Wed Aug 23 2000 Nalin Dahyabhai <nalin@redhat.com>
+- default to being disabled
+
+* Thu Aug 17 2000 Jeff Johnson <jbj@redhat.com>
+- correct group.
+
+* Tue Jul 25 2000 Nalin Dahyabhai <nalin@redhat.com>
+- change user from root to nobody
+
+* Sat Jul 22 2000 Jeff Johnson <jbj@redhat.com>
+- update to tftp-hpa-0.14 (#14003).
+- add server_args (#14003).
+- remove -D_BSD_SOURCE (#14003).
+
+* Fri Jul 21 2000 Nalin Dahyabhai <nalin@redhat.com>
+- cook up an xinetd config file for tftpd
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Sun Jun 18 2000 Jeff Johnson <jbj@redhat.com>
+- FHS packaging.
+- update to 0.17.
+
+* Fri May  5 2000 Matt Wilson <msw@redhat.com>
+- use _BSD_SOURCE for hpa's tftpd so we get BSD signal semantics.
+
+* Fri Feb 11 2000 Bill Nottingham <notting@redhat.com>
+- fix description
+
+* Wed Feb  9 2000 Jeff Johnson <jbj@redhat.com>
+- compress man pages (again).
+
+* Wed Feb 02 2000 Cristian Gafton <gafton@redhat.com>
+- man pages are compressed
+- fix description and summary
+
+* Tue Jan  4 2000 Bill Nottingham <notting@redhat.com>
+- split client and server
+
+* Tue Dec 21 1999 Jeff Johnson <jbj@redhat.com>
+- update to 0.16.
+
+* Sat Aug 28 1999 Jeff Johnson <jbj@redhat.com>
+- update to 0.15.
+
+* Wed Apr  7 1999 Jeff Johnson <jbj@redhat.com>
+- tftpd should truncate file when overwriting (#412)
+
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+- auto rebuild in the new build environment (release 22)
+
+* Mon Mar 15 1999 Jeff Johnson <jbj@redhat.com>
+- compile for 6.0.
+
+* Fri Aug  7 1998 Jeff Johnson <jbj@redhat.com>
+- build root
+
+* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
+
+* Mon Sep 22 1997 Erik Troan <ewt@redhat.com>
+- added check for getpwnam() failure
+
+* Tue Jul 15 1997 Erik Troan <ewt@redhat.com>
+- initial build