diff --git a/tftp-0.42-tftpboot.patch b/tftp-0.42-tftpboot.patch
new file mode 100644
index 0000000..f0b5a22
--- /dev/null
+++ b/tftp-0.42-tftpboot.patch
@@ -0,0 +1,12 @@
+diff -up tftp-hpa-0.42/tftp-xinetd.tftpboot tftp-hpa-0.42/tftp-xinetd
+--- tftp-hpa-0.42/tftp-xinetd.tftpboot	2008-01-22 10:02:56.000000000 +0100
++++ tftp-hpa-0.42/tftp-xinetd	2008-01-22 10:03:09.000000000 +0100
+@@ -10,7 +10,7 @@ service tftp
+ 	wait			= yes
+ 	user			= root
+ 	server			= /usr/sbin/in.tftpd
+-	server_args		= -s /tftpboot
++	server_args		= -s /var/lib/tftpboot
+ 	disable			= yes
+ 	per_source		= 11
+ 	cps			= 100 2
diff --git a/tftp.spec b/tftp.spec
index a3979f4..c2d1910 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -3,14 +3,17 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 5
+Release: 6
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
 URL: http://www.kernel.org/pub/software/network/tftp/
+
 Patch0: tftp-0.40-remap.patch
 Patch1: tftp-hpa-0.42-sigjmp.patch
 Patch2: tftp-hpa-0.39-tzfix.patch
+Patch3: tftp-0.42-tftpboot.patch
+
 BuildRequires: tcp_wrappers-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,6 +42,7 @@ enabled unless it is expressly needed.  The TFTP server is run from
 %patch0 -p1 -b .zero
 %patch1 -p1 -b .sigjmp
 %patch2 -p1 -b .tzfix
+%patch3 -p1 -b .tftpboot
 
 %build
 
@@ -50,6 +54,7 @@ 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}
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
 
 make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
 install -m755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}/tftpboot
@@ -74,11 +79,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %files server
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
-%dir /tftpboot
+%dir %{_localstatedir}/lib/tftpboot
 %{_sbindir}/in.tftpd
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jan 22 2008 Martin Nagy <mnagy@redhat.com> - 0.42-6
+- changed the location of tftpboot directory to /var/lib/
+
 * Fri Aug 31 2007 Maros Barabas <mbarabas@redhat.com> - 0.42-5
 - rebuild