diff -u netkit-tftp-0.17/debian/control netkit-tftp-0.17/debian/control
--- netkit-tftp-0.17/debian/control
+++ netkit-tftp-0.17/debian/control
@@ -1,9 +1,11 @@
 Source: netkit-tftp
 Section: net
 Priority: optional
-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
 Standards-Version: 3.8.0.0
 Build-Depends: debhelper (>= 4.0.2)
+Homepage: http://www.hcs.harvard.edu/~dholland/computers/netkit.html
 
 Package: tftp
 Architecture: any
diff -u netkit-tftp-0.17/debian/rules netkit-tftp-0.17/debian/rules
--- netkit-tftp-0.17/debian/rules
+++ netkit-tftp-0.17/debian/rules
@@ -17,9 +17,6 @@
 
 	if [ ! -f MCONFIG ]; then \
 		./configure; \
-		sed -e 's/^CFLAGS=\(.*\)$$/CFLAGS= -g \1/' MCONFIG \
-			> MCONFIG.new; \
-		mv MCONFIG.new MCONFIG; \
 	fi
 	$(MAKE)
 
diff -u netkit-tftp-0.17/debian/changelog netkit-tftp-0.17/debian/changelog
--- netkit-tftp-0.17/debian/changelog
+++ netkit-tftp-0.17/debian/changelog
@@ -1,3 +1,16 @@
+netkit-tftp (0.17-17ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #314084)
+    - debian/control: Added Homepage field.
+    - debian/rules: Removed the sed to add -g to CFLAGS. This was not
+      working as currently defined (extra \$), and debug (-g) is not
+      required.
+    - Added debian/watch to monitor for new versions.
+    - Patch to return ENOTFOUND instead of EUNDEF for files that do not
+      exist applied to tftpd/tftpd.c (Jerry Kotland - LP: #217537)
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Mon, 05 Jan 2009 16:37:32 +0200
+
 netkit-tftp (0.17-17) unstable; urgency=low
 
   * Require hostname for connection name (Closes: #375365)
@@ -8,6 +21,24 @@
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 30 Dec 2008 15:03:15 +0100
 
+netkit-tftp (0.17-16ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - No remaining changes.
+  * debian/rules:
+    - Removed the sed to add -g to CFLAGS. This was not working as
+      currently defined (extra \$), and debug (-g) is not required. 
+    - Created if statement to check for the presence of MCONFIG to
+      decide if to run make distclean.
+  * Added debian/watch to monitor for new versions.
+  * debian/control:
+    - Added Homepage field.
+  * Patch to return ENOTFOUND instead of EUNDEF for files that
+    do not exist applied to tftpd/tftpd.c
+    (Jerry Kotland - closes LP: #217537)
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Fri, 08 Aug 2008 14:15:39 +0200
+
 netkit-tftp (0.17-16) unstable; urgency=high
 
   * tftpd.c: Fixed security bug that made tftpd serve files from
@@ -28,6 +59,22 @@
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 05 Aug 2008 13:15:15 +0200
 
+netkit-tftp (0.17-15ubuntu2) intrepid; urgency=low
+
+  * debian/control:
+    - Update Maintainer field as per spec (LP: #230350).
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Wed, 04 Jun 2008 23:26:06 +0200
+
+netkit-tftp (0.17-15ubuntu1) feisty; urgency=low
+
+  * debian/control: Add update-inetd to tftpd's dependencies
+    (Closes Ubuntu: #76160).
+  * debian/control: Add openbsd-inetd | inet-superserver dependencies
+    as tftpd needs an inet server to work
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 16:08:24 +0100
+
 netkit-tftp (0.17-15) unstable; urgency=low
 
   * tftpd/tftpd.c: Fixed file mode when new files are uploaded.
diff -u netkit-tftp-0.17/tftpd/tftpd.c netkit-tftp-0.17/tftpd/tftpd.c
--- netkit-tftp-0.17/tftpd/tftpd.c
+++ netkit-tftp-0.17/tftpd/tftpd.c
@@ -366,8 +366,11 @@
 			return(EACCESS);
 		}
 	}
-	if (stat(filename, &stbuf) < 0)
-		return (errno == ENOENT ? ENOTFOUND : EACCESS);
+       if (stat(filename, &stbuf) < 0) {
+               if (mode != WRQ) {
+                       return (errno == ENOENT ? ENOTFOUND : EACCESS);
+               }
+       }
 #if 0
 	/*
 	 * The idea is that symlinks are dangerous. However, a symlink
only in patch2:
unchanged:
--- netkit-tftp-0.17.orig/debian/watch
+++ netkit-tftp-0.17/debian/watch
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-(.*)\.tar\.gz