diff -u mtools-4.0.10/debian/control mtools-4.0.10/debian/control
--- mtools-4.0.10/debian/control
+++ mtools-4.0.10/debian/control
@@ -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>
 Uploaders: Luis Bustamante <luferbu@fluidsignal.com>, Andrés Roldán <aroldan@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, quilt, libxfont-dev, libxt-dev, texinfo
 Standards-Version: 3.8.1
diff -u mtools-4.0.10/debian/changelog mtools-4.0.10/debian/changelog
--- mtools-4.0.10/debian/changelog
+++ mtools-4.0.10/debian/changelog
@@ -1,3 +1,13 @@
+mtools (4.0.10-1ubuntu1) lucid; urgency=low
+
+  * Added debian/patches/11.truncation-fix.patch:
+    - This corrects the behavior of name mangling and truncation when dealing
+      with long filenames, and prevents possible conflicts between a shortname
+      and a long filename. Thanks to Alexandar Sac for helping revise the patch
+      (LP: # 481482)
+
+ -- Michael Casadevall <mcasadevall@ubuntu.com>  Thu, 12 Nov 2009 13:37:53 -0500
+
 mtools (4.0.10-1) unstable; urgency=low
 
   * New upstream version 
diff -u mtools-4.0.10/debian/patches/series mtools-4.0.10/debian/patches/series
--- mtools-4.0.10/debian/patches/series
+++ mtools-4.0.10/debian/patches/series
@@ -7,0 +8 @@
+11.trunication-fix.patch
only in patch2:
unchanged:
--- mtools-4.0.10.orig/debian/patches/11.trunication-fix.patch
+++ mtools-4.0.10/debian/patches/11.trunication-fix.patch
@@ -0,0 +1,36 @@
+Index: mtools-4.0.10/charsetConv.c
+===================================================================
+--- mtools-4.0.10.orig/charsetConv.c	2009-11-13 10:48:25.013503707 -0500
++++ mtools-4.0.10/charsetConv.c	2009-11-13 10:48:26.223493795 -0500
+@@ -410,7 +410,7 @@
+ 			break;
+ 		native += r;
+ 	}
+-	if(mangled && end && native < end)
++	if(mangled && ((end && native < end) || (!end && *native &&  i == len)))
+ 		*mangled |= 3;
+ 	wchar[i]='\0';
+ 	return i;
+Index: mtools-4.0.10/file_name.c
+===================================================================
+--- mtools-4.0.10.orig/file_name.c	2009-11-13 10:54:47.843508064 -0500
++++ mtools-4.0.10/file_name.c	2009-11-13 10:55:55.412317381 -0500
+@@ -63,10 +63,6 @@
+ 
+ 	*Case = NONE;
+ 	for( ;  *s ; s++) {
+-		if(!count) {
+-			*mangled |= 3;
+-			break;
+-		}
+ 		/* skip spaces & dots */
+ 		if(*s == ' ' || *s == '.') {
+ 			*mangled |= 3;
+@@ -91,7 +87,6 @@
+ 				*Case = UPPER;
+ 		} else
+ 			*t = *s;
+-		count--;
+ 		t++;
+ 	}
+ 	wchar_to_dos(toDos, buffer, out, t - buffer, mangled);