Index: uspace/srv/fs/mfs/mfs_dentry.c
===================================================================
--- uspace/srv/fs/mfs/mfs_dentry.c	(revision fb7e5a9acaa179da3a894bc9c613dbfd9df3e4d7)
+++ uspace/srv/fs/mfs/mfs_dentry.c	(revision f7d6b308ac8f262b562ea7d29437c558cca483dc)
@@ -76,4 +76,5 @@
 		d_info->d_inum = conv32(sbi->native, d3->d_inum);
 		memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
+		d_info->d_name[MFS3_MAX_NAME_LEN] = 0;
 	} else {
 		const int namelen = longnames ? MFS_L_MAX_NAME_LEN :
@@ -86,4 +87,5 @@
 		d_info->d_inum = conv16(sbi->native, d->d_inum);
 		memcpy(d_info->d_name, d->d_name, namelen);
+		d_info->d_name[namelen] = 0;
 	}
 
@@ -249,5 +251,6 @@
 	d_info.d_inum = d_inum;
 	memcpy(d_info.d_name, d_name, name_len);
-	d_info.d_name[name_len] = 0;
+	if (name_len < sbi->max_name_len)
+		d_info.d_name[name_len] = 0;
 
 	r = mfs_write_dentry(&d_info);