diff -Nru mtools-4.0.18/debian/changelog mtools-4.0.18/debian/changelog
--- mtools-4.0.18/debian/changelog	2016-08-06 23:52:44.000000000 +0000
+++ mtools-4.0.18/debian/changelog	2016-09-20 19:39:33.000000000 +0000
@@ -1,3 +1,17 @@
+mtools (4.0.18-2ubuntu2~ppa1) xenial; urgency=medium
+
+  * Up-port patch to support xz
+
+ -- Dominik Stadler (Ubuntu key) <dominik.stadler@gmx.at>  Tue, 20 Sep 2016 21:39:10 +0200
+
+mtools (4.0.18-2ubuntu1) yakkety; urgency=medium
+
+  * debian/patches/initialize-direntry.patch: initialize direntry with
+    memset to correct invalid bitfields.  Thanks to
+    Ronny Nilsson <rln-mtools@arbetsmyra.dyndns.org>.  LP: #1619718.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 07 Sep 2016 23:40:07 -0700
+
 mtools (4.0.18-2ubuntu0~ppa1) xenial; urgency=medium
 
   * Up-port patch to support xz
diff -Nru mtools-4.0.18/debian/control mtools-4.0.18/debian/control
--- mtools-4.0.18/debian/control	2016-08-06 23:50:51.000000000 +0000
+++ mtools-4.0.18/debian/control	2016-09-20 19:37:12.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mtools
 Section: otherosfs
 Priority: optional
-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autotools-dev, libxfont-dev, libxt-dev, texinfo
 Standards-Version: 3.9.6
 Homepage: http://www.gnu.org/software/mtools/
diff -Nru mtools-4.0.18/debian/patches/initialize-direntry.patch mtools-4.0.18/debian/patches/initialize-direntry.patch
--- mtools-4.0.18/debian/patches/initialize-direntry.patch	1970-01-01 00:00:00.000000000 +0000
+++ mtools-4.0.18/debian/patches/initialize-direntry.patch	2016-09-20 19:37:41.000000000 +0000
@@ -0,0 +1,18 @@
+Author: Ronny Nilsson <rln-mtools@arbetsmyra.dyndns.org>
+Description: initialize direntry with memset to correct invalid bitfields
+ mcopy will create directory entries with invalid bitfields because of
+ uninitialized memory.  Initialize this structure with memset() to avoid
+ corrupt filesystems.
+Bug-Ubuntu: https://bugs.launchpad.net/bug/1619718
+
+diff -rup mtools-4.0.18.orig/direntry.c mtools-4.0.18/direntry.c
+--- mtools-4.0.18.orig/direntry.c	2010-10-11 21:18:53.000000000 +0000
++++ mtools-4.0.18/direntry.c	2014-08-27 16:44:32.984959149 +0000
+@@ -24,6 +24,7 @@
+ 
+ void initializeDirentry(direntry_t *entry, Stream_t *Dir)
+ {
++	memset(entry, 0, sizeof(direntry_t));
+ 	entry->entry = -1;
+ /*	entry->parent = getDirentry(Dir);*/
+ 	entry->Dir = Dir;
diff -Nru mtools-4.0.18/debian/patches/series mtools-4.0.18/debian/patches/series
--- mtools-4.0.18/debian/patches/series	2016-08-06 23:49:12.000000000 +0000
+++ mtools-4.0.18/debian/patches/series	2016-09-20 19:38:15.000000000 +0000
@@ -1,2 +1,3 @@
 01-607426-support-zip-files-in-uz.patch
+initialize-direntry.patch
 13.xz-support.patch