diff -u atftp-0.7.dfsg/debian/control atftp-0.7.dfsg/debian/control
--- atftp-0.7.dfsg/debian/control
+++ atftp-0.7.dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: atftp
 Section: net
 Priority: extra
-Maintainer: Ludovic Drolez <ldrolez@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ludovic Drolez <ldrolez@debian.org>
 Build-Depends: libreadline5-dev, debhelper (>= 4.1.16), po-debconf, libwrap0-dev, libpcre3-dev
 Standards-Version: 3.8.0
 
diff -u atftp-0.7.dfsg/debian/changelog atftp-0.7.dfsg/debian/changelog
--- atftp-0.7.dfsg/debian/changelog
+++ atftp-0.7.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+atftp (0.7.dfsg-6ubuntu1) jaunty; urgency=low
+
+  * Stop atftp from crashing on 0-byte error strings (LP: #309746)
+    Patch by Jakob Hilmer
+
+ -- Mackenzie Morgan <maco.m@ubuntu.com>  Sun, 22 Mar 2009 15:10:44 -0400
+
 atftp (0.7.dfsg-6) unstable; urgency=medium
 
   * Urgency = medium because of a grave bug
only in patch2:
unchanged:
--- atftp-0.7.dfsg.orig/tftp_def.c
+++ atftp-0.7.dfsg/tftp_def.c
@@ -140,8 +140,10 @@
  */
 inline char *Strncpy(char *to, const char *from, size_t size)
 {
-     to[size-1] = '\000';
-     return strncpy(to, from, size - 1);
+     strncpy(to, from, size);
+	 if (size>0) 
+          to[size-1] = '\000';
+	 return to;
 }