diff --git a/compat-usrmerge.changes b/compat-usrmerge.changes
index 94eb82c..f612632 100644
--- a/compat-usrmerge.changes
+++ b/compat-usrmerge.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 15 15:27:41 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- another fix for split /usr to avoid running out of space (boo#1186781)
+- unsafe fallback also for ENOSYS on renameat2 as seen on WSL
+
 -------------------------------------------------------------------
 Tue Jun  8 12:03:52 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/convertfs b/convertfs
index e82a95d..91115be 100644
--- a/convertfs
+++ b/convertfs
@@ -78,7 +78,7 @@ for dir in bin sbin lib lib64; do
     echo "Merge the copy with \`$ROOT/usr/$dir'."
     [[ -d "$ROOT/usr/${dir}.usrmerge" ]] \
         || mkdir -p "$ROOT/usr/${dir}.usrmerge"
-    cp -axT $CP_HARDLINK --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmerge"
+    cp -axT -l --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmerge"
     echo "Clean up duplicates in \`$ROOT/usr/$dir'."
     # delete all symlinks that have been backed up. /usr versions
     # override / ones
diff --git a/xmv.c b/xmv.c
index d3bc20d..cdddb95 100644
--- a/xmv.c
+++ b/xmv.c
@@ -70,7 +70,9 @@ int main(int argc, char** argv)
 	const char *source = argv[optind], *target = argv[optind+1];
 	r = syscall (SYS_renameat2, AT_FDCWD, source, AT_FDCWD, target, RENAME_EXCHANGE);
 	if (r < 0) {
-		if (errno != EINVAL) {
+		// FS not supporting RENAME_EXCHANGE -> EINVAL
+		// No renameat2 syscall -> ENOSYS (eg WSL)
+		if (errno != EINVAL && errno != ENOSYS) {
 			perror("renameat2");
 			return 1;
 		}