diff -up ecryptfs-utils-87/src/utils/mount.ecryptfs.c.memcpyfix ecryptfs-utils-87/src/utils/mount.ecryptfs.c
--- ecryptfs-utils-87/src/utils/mount.ecryptfs.c.memcpyfix	2011-07-11 15:04:00.742821125 +0200
+++ ecryptfs-utils-87/src/utils/mount.ecryptfs.c	2011-07-11 15:04:15.590926517 +0200
@@ -189,7 +189,7 @@ static int ecryptfs_generate_mount_flags
 			*end = '\0';
 			break;
 		}
-		memcpy(opt, next_opt, end - next_opt);
+		memmove(opt, next_opt, end - next_opt);
 		end = end - (next_opt - opt);
 		*end = '\0';
 	}
@@ -416,7 +416,7 @@ static int opts_str_contains_option(char
 			*end = '\0';
 			break;
 		}
-		memcpy(opt, next_opt, end - next_opt);
+		memmove(opt, next_opt, end - next_opt);
 		end = end - (next_opt - opt);
 		*end = '\0';
 	}